summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Jones <rjones@redhat.com>2009-04-24 22:26:50 +0100
committerRichard Jones <rjones@redhat.com>2009-04-24 22:26:50 +0100
commit18bf945023071d5d4ec8d96e25142e0ffd066e7c (patch)
tree80694030b300cb7385af2c4d21000340095b1eee
parent072567882711725190593f2196e658d5ebf6d5ca (diff)
downloadlibguestfs-18bf945023071d5d4ec8d96e25142e0ffd066e7c.tar.gz
libguestfs-18bf945023071d5d4ec8d96e25142e0ffd066e7c.tar.xz
libguestfs-18bf945023071d5d4ec8d96e25142e0ffd066e7c.zip
Remove the debug mode from make-initramfs.sh.
-rw-r--r--BUGS6
-rwxr-xr-xmake-initramfs.sh.in34
2 files changed, 22 insertions, 18 deletions
diff --git a/BUGS b/BUGS
index e6323774..8776de26 100644
--- a/BUGS
+++ b/BUGS
@@ -1,15 +1,19 @@
[guestfish] Built-in commands like 'alloc' and 'help' don't auto-complete.
[libguestfs] /tmp/libguestfs temporary directory is not cleaned up
-(sometimes).
+sometimes. This appears to happen (only?) if the main program
+segfaults.
[libguestfs] qemu process not cleaned up occasionally. This appears
to happen only if the main program or library segfaults, in which case
the atexit handler which would normally perform cleanup is not run.
+sometimes. This appears to happen (only?) if the main program
+segfaults.
[kernel?] Kernel boot times are significantly slower for Fedora 11/12
than for Fedora 10, like 2-3 times slower. This greatly affects the
time it takes to launch the subprocess (although it does still work).
+[fixed - was a KVM bug]
[java] Java bindings documentation messed up. See:
http://java.sun.com/j2se/javadoc/writingdoccomments/ \ No newline at end of file
diff --git a/make-initramfs.sh.in b/make-initramfs.sh.in
index 6e7e98f1..985e9ba8 100755
--- a/make-initramfs.sh.in
+++ b/make-initramfs.sh.in
@@ -22,16 +22,22 @@ set -e
unset CDPATH
-# If you want to do some extra debugging and diagnosis of the
-# initramfs image, then uncomment this line. This makes the image
-# larger.
-debug=yes
-
-modules="-i kernel -i bash -i coreutils -i lvm2 -i ntfs-3g -i util-linux-ng -i MAKEDEV -i net-tools -i augeas-libs -i file"
-
-if [ "x$debug" = "xyes" ]; then
- modules="$modules -i module-init-tools -i procps -i strace -i iputils"
-fi
+modules="
+-i augeas-libs
+-i bash
+-i coreutils
+-i file
+-i iputils
+-i kernel
+-i lvm2
+-i MAKEDEV
+-i module-init-tools
+-i net-tools
+-i ntfs-3g
+-i procps
+-i strace
+-i util-linux-ng
+"
# Decide on names for the final output. These have to match Makefile.am.
output=initramfs.@REPO@.@host_cpu@.img
@@ -125,15 +131,9 @@ modprobe 8139cp
/sbin/route add default gw 10.0.2.2
lvm vgscan --ignorelockingfailure
lvm vgchange -ay --ignorelockingfailure
+exec guestfsd -f
__EOF__
-if [ "x$debug" != "xyes" ]; then
- echo exec guestfsd -f >> init.new
-else
- echo guestfsd >> init.new
- echo exec bash -i >> init.new
-fi
-
install_file init.new /init 0755 root.root
rm init.new