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

diff --git a/appliance/init b/appliance/init
index dce5927..b741a49 100755
--- a/appliance/init
+++ b/appliance/init
@@ -9,8 +9,8 @@ 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
+elif [ -x /sbin/start_udev ] && /sbin/start_udev; then
+  :
 else
   echo No udev, creating /dev manually
   mount -t tmpfs none /dev
@@ -33,6 +33,10 @@ else
   modprobe virtio_net
 fi
 
+if grep -sq selinux=1 /proc/cmdline; then
+  mount -t selinuxfs none /selinux
+fi
+
 modprobe dm_mod ||:
 
 ifconfig lo 127.0.0.1
@@ -42,19 +46,36 @@ 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
 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
 
-# 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.
+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