Tidy up appliance rescue code.

[libguestfs.git] / appliance / init

diff --git a/appliance/init b/appliance/init
index dbe53f4..8b97590 100755 (executable)
--- a/appliance/init
+++ b/appliance/init
@@ -33,21 +33,39 @@ 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
 
+# 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
 
-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
+
+TERM=linux ;# XXX library should pass this from library's environment
+PS1='><rescue> '
+export TERM PS1
+exec bash -i