X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=appliance%2Finit;h=f3999160b56a0e4683ebca70e58e00b2bfec96cb;hb=977edb3185fe8f0cc01840227ac6d3ea1785d3c9;hp=4e9b66fc22cadaac0ea4400febecbe6105da6ff7;hpb=300461966b053bb62249f9084d4a85b25fee48f6;p=libguestfs.git

diff --git a/appliance/init b/appliance/init
index 4e9b66f..f399916 100755
--- a/appliance/init
+++ b/appliance/init
@@ -2,15 +2,25 @@
 
 echo Starting /init script ...
 
-PATH=/sbin:/usr/sbin:$PATH
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+export PATH
 
 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
@@ -46,6 +56,9 @@ route add default gw 10.0.2.2
 lvm vgscan --ignorelockingfailure
 lvm vgchange -ay --ignorelockingfailure
 
+# Improve virtio-blk performance (RHBZ#509383).
+for f in /sys/block/vd*/queue/rotational; do echo 1 > $f; done
+
 # Keep these to enhance the usefulness of debug output.
 ls -l /dev
 cat /proc/mounts
@@ -58,22 +71,30 @@ lsmod
 #ping -n -v -c 5 10.0.2.2
 #ping -n -v -c 5 10.0.2.4
 
-# Improve virtio-blk performance (RHBZ#509383).
-for f in /sys/block/vd*/queue/rotational; do echo 1 > $f; done
+echo -n "uptime: "; cat /proc/uptime
 
 if ! grep -sq guestfs_rescue=1 /proc/cmdline; then
   exec guestfsd -f
 fi
 
 # Use appliance in rescue mode, also used by the virt-rescue command.
-TERM=linux ;# XXX library should pass this from library's environment
+eval $(grep -Eo 'TERM=[^[:space:]]+' /proc/cmdline)
 PS1='><rescue> '
 export TERM PS1
 echo
+echo "------------------------------------------------------------"
+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
+bash -i
+echo
+echo "virt-rescue: Syncing the disk now before exiting ..."
+echo "(Don't worry if you see a 'Kernel panic' message below)"
+echo
+sync
+sleep 1
+sync