X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=appliance%2Finit;h=84ee96e3033375936cf09ffbaa94ff963b085b4c;hp=dbe53f454a3de74f02f3e44188a4b6c76fe88017;hb=599f94c9c14c970dcfd7cec8d6898cd3b46af8ca;hpb=373a9ad0abb09ee079da834d251a744cdbe9ae70

diff --git a/appliance/init b/appliance/init
index dbe53f4..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
-elif [ -x /sbin/start_udev ]; then
-  /sbin/start_udev
+  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
@@ -33,13 +42,15 @@ else
   modprobe virtio_net
 fi
 
+if grep -sq selinux=1 /proc/cmdline; then
+  mount -t selinuxfs none /selinux
+fi
+
 modprobe dm_mod ||:
-mount
-ls -l /dev
 
-/sbin/ifconfig lo 127.0.0.1
-/sbin/ifconfig eth0 10.0.2.10
-/sbin/route add default gw 10.0.2.2
+ifconfig lo 127.0.0.1
+ifconfig eth0 10.0.2.10
+route add default gw 10.0.2.2
 
 lvm vgscan --ignorelockingfailure
 lvm vgchange -ay --ignorelockingfailure
@@ -47,7 +58,33 @@ lvm vgchange -ay --ignorelockingfailure
 # Improve virtio-blk performance (RHBZ#509383).
 for f in /sys/block/vd*/queue/rotational; do echo 1 > $f; done
 
-if grep -sq guestfs_rescue=1 /proc/cmdline; then
-  bash -i
+# Keep these to enhance the usefulness of debug output.
+ls -l /dev
+cat /proc/mounts
+lvm pvs
+lvm vgs
+lvm lvs
+ifconfig
+netstat -rn
+lsmod
+#ping -n -v -c 5 10.0.2.2
+#ping -n -v -c 5 10.0.2.4
+
+echo -n "uptime: "; cat /proc/uptime
+
+if ! grep -sq guestfs_rescue=1 /proc/cmdline; then
+  exec guestfsd -f
 fi
-exec guestfsd -f
+
+# Use appliance in rescue mode, also used by the virt-rescue command.
+TERM=linux ;# XXX library should pass this from library's environment
+PS1='><rescue> '
+export TERM PS1
+echo
+echo "Welcome to virt-rescue, the libguestfs rescue shell."
+echo
+echo "Note: The contents of / are the rescue appliance."
+echo "You have to mount the guest's partitions under /sysroot"
+echo "before you can examine them."
+echo
+exec bash -i