[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1.0.84-3-2-gd50fd25

[Guido Günther]

The following commit has been merged in the master branch:
commit d50fd251f4e8f299eb034c3a977d657ee04e4d1a
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Feb 23 18:52:13 2010 +0100

    New patch 0005-Check-for-service-and-use-it-if-it-s-there.patch
    
    Check for service and use it if it's there

diff --git a/debian/patches/0005-Check-for-service-and-use-it-if-it-s-there.patch b/debian/patches/0005-Check-for-service-and-use-it-if-it-s-there.patch
new file mode 100644
index 0000000..70ab1d1
--- /dev/null
+++ b/debian/patches/0005-Check-for-service-and-use-it-if-it-s-there.patch
@@ -0,0 +1,34 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Tue, 23 Feb 2010 18:49:34 +0100
+Subject: [PATCH] Check for service and use it if it's there
+
+Based on Richard's two patches for the Ubuntu build.
+---
+ appliance/init |   11 ++++++++++-
+ 1 files changed, 10 insertions(+), 1 deletions(-)
+
+diff --git a/appliance/init b/appliance/init
+index b741a49..84ee96e 100755
+--- a/appliance/init
++++ b/appliance/init
+@@ -8,9 +8,18 @@ mount -t proc /proc /proc
+ mount -t sysfs /sys /sys
+ 
+ if [ -x /etc/init.d/udev ]; then
+-  /etc/init.d/udev start
++  if type service >/dev/null 2>&1; then
++     service udev start
++  else
++     /etc/init.d/udev start
++  fi
+ elif [ -x /sbin/start_udev ] && /sbin/start_udev; then
+   :
++elif [ -x /sbin/udevd ]; then
++  echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
++  /sbin/udevd --daemon
++  /sbin/udevadm trigger
++  /sbin/udevadm settle --timeout=10
+ else
+   echo No udev, creating /dev manually
+   mount -t tmpfs none /dev
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index a090e91..2765b00 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-scrub-now-available-on-Debian.patch
 0003-Adjust-error-output-for-regressions-rhbz557655.patch
 0004-Disable-fuser-tests-if-dev-fuse-doesn-t-exist.patch
+0005-Check-for-service-and-use-it-if-it-s-there.patch

-- 
Libguestfs Debian packaging