From: Richard Jones <rjones@redhat.com>
Date: Thu, 20 May 2010 17:53:10 +0000 (+0100)
Subject: ubuntu: Use direct udevd method to start udev on Ubuntu.
X-Git-Tag: 1.3.14~13
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=5f9630338b59d422b640a25a02b46abb3c5f1986;p=libguestfs.git

ubuntu: Use direct udevd method to start udev on Ubuntu.

On Ubuntu, /etc/init.d/udev is a symlink to an upstart file,
but running that causes the appliance to hang.

Therefore detect if this is a symlink and fall through to the
direct start of udevd.  This shouldn't affect Debian because the
file is not a symlink on standard Debian.
---

diff --git a/appliance/init b/appliance/init
index 9ecf007..c622788 100755
--- a/appliance/init
+++ b/appliance/init
@@ -10,7 +10,7 @@ mkdir -p /sysroot
 mount -t proc /proc /proc
 mount -t sysfs /sys /sys
 
-if [ -x /etc/init.d/udev ]; then
+if [ ! -L /etc/init.d/udev -a -x /etc/init.d/udev ]; then
   if type service >/dev/null 2>&1; then
      service udev start
   else