diff --git a/libguestfs.mkinitrd.boot.sh b/libguestfs.mkinitrd.boot.sh
index 0fac81b..c83f418 100644
--- a/libguestfs.mkinitrd.boot.sh
+++ b/libguestfs.mkinitrd.boot.sh
@@ -1,7 +1,80 @@
 #!/bin/bash
 #%stage: block
 #
-#%modules: dm-mod virtio_blk virtio_console virtio_net virtio_pci virtio_scsi sg sd_mod sr_mod
+#%modules: dm-mod
+#
+#%udevmodules: virtio_blk
+#%udevmodules: virtio_console
+#%udevmodules: virtio_net
+#%udevmodules: virtio_pci
+#%udevmodules: virtio_scsi
+#%udevmodules: sg
+#%udevmodules: sd_mod
+#%udevmodules: sr_mod
+#%udevmodules: 
+#%udevmodules: loop
+#%udevmodules: 
+#%udevmodules: 9p
+#%udevmodules: btrfs
+#%udevmodules: cramfs
+#%udevmodules: ext2
+#%udevmodules: ext3
+#%udevmodules: ext4
+#%udevmodules: fat
+#%udevmodules: fuse
+#%udevmodules: hfs
+#%udevmodules: hfsplus
+#%udevmodules: jfs
+#%udevmodules: minix
+#%udevmodules: nfs
+#%udevmodules: quota
+#%udevmodules: reiserfs
+#%udevmodules: squashfs
+#%udevmodules: squashfs3
+#%udevmodules: udf
+#%udevmodules: ufs
+#%udevmodules: xfs
+#%udevmodules: 
+#%udevmodules: nls_ascii
+#%udevmodules: nls_cp1250
+#%udevmodules: nls_cp1251
+#%udevmodules: nls_cp1255
+#%udevmodules: nls_cp437
+#%udevmodules: nls_cp737
+#%udevmodules: nls_cp775
+#%udevmodules: nls_cp850
+#%udevmodules: nls_cp852
+#%udevmodules: nls_cp855
+#%udevmodules: nls_cp857
+#%udevmodules: nls_cp860
+#%udevmodules: nls_cp861
+#%udevmodules: nls_cp862
+#%udevmodules: nls_cp863
+#%udevmodules: nls_cp864
+#%udevmodules: nls_cp865
+#%udevmodules: nls_cp866
+#%udevmodules: nls_cp869
+#%udevmodules: nls_cp874
+#%udevmodules: nls_cp932
+#%udevmodules: nls_cp936
+#%udevmodules: nls_cp949
+#%udevmodules: nls_cp950
+#%udevmodules: nls_euc-jp
+#%udevmodules: nls_iso8859-1
+#%udevmodules: nls_iso8859-13
+#%udevmodules: nls_iso8859-14
+#%udevmodules: nls_iso8859-15
+#%udevmodules: nls_iso8859-2
+#%udevmodules: nls_iso8859-3
+#%udevmodules: nls_iso8859-4
+#%udevmodules: nls_iso8859-5
+#%udevmodules: nls_iso8859-6
+#%udevmodules: nls_iso8859-7
+#%udevmodules: nls_iso8859-9
+#%udevmodules: nls_koi8-r
+#%udevmodules: nls_koi8-ru
+#%udevmodules: nls_koi8ru
+#%udevmodules: nls_utf8
 #
 #%programs: mdadm
 #%programs: modprobe
@@ -39,7 +112,13 @@ for f in /sys/block/vd*/queue/rotational; do if test -f $f ; then echo 1 > $f; f
 # These are useful when debugging.
 if grep -sq guestfs_verbose=1 /proc/cmdline; then
     ls -lR /dev
-    head -n 1234 /proc/mounts /proc/modules /proc/version /proc/cpuinfo
+    head -n 1234 \
+    	/proc/mounts \
+	/proc/modules \
+	/proc/partitions \
+	/proc/version \
+	/proc/cpuinfo \
+	/proc/uptime 
     lvm pvs
     lvm vgs
     lvm lvs
@@ -49,8 +128,6 @@ if grep -sq guestfs_verbose=1 /proc/cmdline; then
     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
 
 echo "These commands might be called by guestfsd, but they were not available at buildtime:"
diff --git a/libguestfs.spec b/libguestfs.spec
index eff0867..80d5e5d 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -466,69 +466,6 @@ done
 chmod -v 755 mkinitrd/bin_tmp/*
 #
 additional_modules="
-loop
-
-9p
-btrfs
-cramfs
-ext2
-ext3
-ext4
-fat
-fuse
-hfs
-hfsplus
-jfs
-minix
-nfs
-quota
-reiserfs
-squashfs
-squashfs3
-udf
-ufs
-xfs
-
-nls_ascii
-nls_cp1250
-nls_cp1251
-nls_cp1255
-nls_cp437
-nls_cp737
-nls_cp775
-nls_cp850
-nls_cp852
-nls_cp855
-nls_cp857
-nls_cp860
-nls_cp861
-nls_cp862
-nls_cp863
-nls_cp864
-nls_cp865
-nls_cp866
-nls_cp869
-nls_cp874
-nls_cp932
-nls_cp936
-nls_cp949
-nls_cp950
-nls_euc-jp
-nls_iso8859-1
-nls_iso8859-13
-nls_iso8859-14
-nls_iso8859-15
-nls_iso8859-2
-nls_iso8859-3
-nls_iso8859-4
-nls_iso8859-5
-nls_iso8859-6
-nls_iso8859-7
-nls_iso8859-9
-nls_koi8-r
-nls_koi8-ru
-nls_koi8ru
-nls_utf8
 "
 env PATH=$PWD/mkinitrd/bin_tmp:${PATH} \
 bash -x \