X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=appliance%2Finit;h=15dab6142e9970b68c7804dbec8692bffbe9c192;hb=2b43970c8c97f24b1f45c040c6963d30661fa514;hp=dce592765939dfa8923b5c882b9a7b2115bb5595;hpb=315b3069a083c89921f8ee44de19c53cea7e3b11;p=libguestfs.git

diff --git a/appliance/init b/appliance/init
index dce5927..15dab61 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
-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,28 +43,65 @@ else
   modprobe virtio_net
 fi
 
-modprobe dm_mod ||:
+if grep -sq selinux=1 /proc/cmdline; then
+  mount -t selinuxfs none /selinux
+fi
+
+# Update the system clock.
+hwclock -u -s
 
+# Set up the network.
 ifconfig lo 127.0.0.1
 ifconfig eth0 10.0.2.10
 route add default gw 10.0.2.2
 
+# Scan for LVM.
+modprobe dm_mod ||:
+
 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
 lvm pvs
 lvm vgs
 lvm lvs
 ifconfig
 netstat -rn
 lsmod
+#hwclock -r
+date
+#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
-  bash -i
+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.
+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
+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