git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
appliance: udev-174 moves udevd to /lib/udev/udevd (instead of /sbin/udevd)
[libguestfs.git]
/
appliance
/
init
diff --git
a/appliance/init
b/appliance/init
index
90da1cb
..
3189079
100755
(executable)
--- a/
appliance/init
+++ b/
appliance/init
@@
-5,9
+5,16
@@
echo Starting /init script ...
PATH=/sbin:/usr/sbin:/bin:/usr/bin
export PATH
PATH=/sbin:/usr/sbin:/bin:/usr/bin
export PATH
+# Debian bug 606622.
+RUNLEVEL=S
+PREVLEVEL=N
+export RUNLEVEL PREVLEVEL
+
mkdir -p /sysroot
mkdir -p /sysroot
+rm -f /proc; mkdir /proc
mount -t proc /proc /proc
mount -t proc /proc /proc
+rm -f /sys; mkdir /sys
mount -t sysfs /sys /sys
if [ ! -L /etc/init.d/udev -a -x /etc/init.d/udev ]; then
mount -t sysfs /sys /sys
if [ ! -L /etc/init.d/udev -a -x /etc/init.d/udev ]; then
@@
-22,7
+29,12
@@
elif [ -x /sbin/udevd ]; then
echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
/sbin/udevd --daemon
/sbin/udevadm trigger
echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
/sbin/udevd --daemon
/sbin/udevadm trigger
- /sbin/udevadm settle --timeout=10
+ /sbin/udevadm settle
+elif [ -x /lib/udev/udevd ]; then
+ echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
+ /lib/udev/udevd --daemon
+ /sbin/udevadm trigger
+ /sbin/udevadm settle
else
echo No udev, creating /dev manually
mount -t tmpfs none /dev
else
echo No udev, creating /dev manually
mount -t tmpfs none /dev
@@
-67,11
+79,13
@@
lvm vgchange -ay --ignorelockingfailure
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/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
+# 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
# These are useful when debugging.
if grep -sq guestfs_verbose=1 /proc/cmdline; then
- ls -l /dev
+ ls -l
R
/dev
cat /proc/mounts
lvm pvs
lvm vgs
cat /proc/mounts
lvm pvs
lvm vgs
@@
-89,7
+103,7
@@
fi
if ! grep -sq guestfs_rescue=1 /proc/cmdline; then
# The host will kill qemu abruptly if guestfsd shuts down normally
if ! grep -sq guestfs_rescue=1 /proc/cmdline; then
# The host will kill qemu abruptly if guestfsd shuts down normally
- guestfsd
-f
+ guestfsd
# 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.
# 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.
@@
-110,8
+124,8
@@
else
bash -i
echo
echo "virt-rescue: Syncing the disk now before exiting ..."
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
fi
sync
echo
fi
sync
+/sbin/reboot -f