X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=appliance%2Finit;h=d7fe24e5f67b7b71284361a767b2a89ab5664fb5;hp=b33a34cb54a2b970f61cc51c0143ea9d501506f3;hb=641ccab6c3b17f1c94676eab99e8baa9cddf5a0b;hpb=0aaf061c2f73f8852c59afaa9706f42bc578caae

diff --git a/appliance/init b/appliance/init
index b33a34c..d7fe24e 100755
--- a/appliance/init
+++ b/appliance/init
@@ -2,15 +2,28 @@
 
 echo Starting /init script ...
 
-PATH=/sbin:/usr/sbin:$PATH
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+export PATH
 
+mkdir -p /sysroot
+
+rm -f /proc; mkdir /proc
 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 [ ! -L /etc/init.d/udev -a -x /etc/init.d/udev ]; then
+  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,31 +46,75 @@ 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
+ifconfig eth0 169.254.2.10
+route add default gw 169.254.2.2
+
+# Scan for LVM.
+modprobe dm_mod ||:
 
 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
+# http://kbase.redhat.com/faq/docs/DOC-5428
+# Disabled this until https://bugzilla.redhat.com/show_bug.cgi?id=630583
+# is fixed (broken in Linux 2.6.36).
+#for f in /sys/block/[hsv]d*/queue/scheduler; do echo noop > $f; done
+
+# These are useful when debugging.
+if grep -sq guestfs_verbose=1 /proc/cmdline; then
+    ls -lR /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
+
+    echo -n "uptime: "; cat /proc/uptime
+fi
+
+if ! grep -sq guestfs_rescue=1 /proc/cmdline; then
+  # The host will kill qemu abruptly if guestfsd shuts down normally
+  guestfsd -f
+
+  # Otherwise we try to clean up gracefully. For example, this ensures that a
+  # core dump generated by the guest daemon will be written to disk.
+else
+  # 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
 fi
-exec guestfsd -f
+
+sync
+/sbin/reboot -f