git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 'unknown filesystem' warnings in old inspection code (RHBZ#678231 RHBZ#666578).
[libguestfs.git]
/
appliance
/
init
diff --git
a/appliance/init
b/appliance/init
index
bd93d15
..
8bc422d
100755
(executable)
--- a/
appliance/init
+++ b/
appliance/init
@@
-5,6
+5,11
@@
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
rm -f /proc; mkdir /proc
mkdir -p /sysroot
rm -f /proc; mkdir /proc
@@
-23,7
+28,7
@@
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
else
echo No udev, creating /dev manually
mount -t tmpfs none /dev
else
echo No udev, creating /dev manually
mount -t tmpfs none /dev
@@
-68,7
+73,9
@@
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
@@
-90,7
+97,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.