X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=appliance%2Finit;h=6aeea0c3ab691f7bd03c0dd856d75b50d44fee6b;hb=e503b31c15117a82abfe9dd4ba560ea6d03e45ca;hp=b741a497138139322f52bef0357f224a482e0313;hpb=09d7b265e6a0b78592b0a8cc78d9382fd5cb680b;p=libguestfs.git

diff --git a/appliance/init b/appliance/init
index b741a49..6aeea0c 100755
--- a/appliance/init
+++ b/appliance/init
@@ -2,15 +2,27 @@
 
 echo Starting /init script ...
 
-PATH=/sbin:/usr/sbin:$PATH
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+export PATH
+
+mkdir -p /sysroot
 
 mount -t proc /proc /proc
 mount -t sysfs /sys /sys
 
-if [ -x /etc/init.d/udev ]; then
-  /etc/init.d/udev start
+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
@@ -37,11 +49,16 @@ if grep -sq selinux=1 /proc/cmdline; then
   mount -t selinuxfs none /selinux
 fi
 
-modprobe dm_mod ||:
+# 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
@@ -49,33 +66,49 @@ 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
+# http://kbase.redhat.com/faq/docs/DOC-5428
+for f in /sys/block/[hsv]d*/queue/scheduler; do echo noop > $f; done
 
-echo -n "uptime: "; cat /proc/uptime
+# These are useful when debugging.
+if grep -sq guestfs_verbose=1 /proc/cmdline; then
+    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
+
+    echo -n "uptime: "; cat /proc/uptime
+fi
 
 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