X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=appliance%2Finit;h=b8133caf9c3ffd61caa210c603dae1d54ec384b5;hp=fe01e00554c0964a9acc4b7ec26ec973e410465e;hb=637f8df83726ab9b50e8a6d2181bd1e0e93ec13e;hpb=9e0b31a2af26b8d58a44dd80993a5e73d4942307

diff --git a/appliance/init b/appliance/init
index fe01e00..b8133ca 100755
--- a/appliance/init
+++ b/appliance/init
@@ -5,10 +5,12 @@ echo Starting /init script ...
 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
+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
@@ -47,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
@@ -59,6 +66,9 @@ lvm vgchange -ay --ignorelockingfailure
 # Improve virtio-blk performance (RHBZ#509383).
 for f in /sys/block/vd*/queue/rotational; do echo 1 > $f; done
 
+# http://kbase.redhat.com/faq/docs/DOC-5428
+for f in /sys/block/[hsv]d*/queue/scheduler; do echo noop > $f; done
+
 # Keep these to enhance the usefulness of debug output.
 ls -l /dev
 cat /proc/mounts
@@ -68,6 +78,8 @@ 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
 
@@ -78,14 +90,23 @@ if ! grep -sq guestfs_rescue=1 /proc/cmdline; then
 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