initramfs-tools unblock
please unblock initramfs-tools 0.92n
it contains 3 important fixes plus minor docs update.
the ide one is relevant for the upcoming d-i release.
see belows diff.
happy christmas to everyone
maks
diff --git a/debian/changelog b/debian/changelog
index 9acbfcc..4edb150 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+initramfs-tools (0.92n) unstable; urgency=high
+
+ [ Eugene Paskevich ]
+ * hook-functions: Fix MODULES=dep for lvm LABEL fstab notation.
+ (closes: #508906)
+
+ [ maximilian attems ]
+ * all_generic_ide: Also parse boolean bootoption. (closes: #507805)
+ * initramfs-tools.8: Document where to look up NFSOPTS. (closes: #502927)
+ * update-initramfs.8: List -d and mark the non-optional as such.
+
+ [ S. Sakar ]
+ * hook-functions: MODULES=dep fix encrypted loop device.
+ (closes: #499666)
+
+ -- maximilian attems <maks@debian.org> Fri, 19 Dec 2008 14:03:13 +0100
+
initramfs-tools (0.92m) unstable; urgency=medium
[ Colin Watson ]
diff --git a/hook-functions b/hook-functions
index 5b6230a..6a68910 100644
--- a/hook-functions
+++ b/hook-functions
@@ -246,7 +246,8 @@ dep_add_modules()
manual_add_modules "${FSTYPE}"
# lvm or luks root
- if [ "${root#/dev/mapper/}" != "${root}" ]; then
+ if [ "${root#/dev/mapper/}" != "${root}" ] \
+ || [ "${root#/dev/dm-}" != "${root}" ]; then
minor=$((0x$(stat --format "%T" ${root}) % 256))
block=$(ls -1 /sys/block/dm-${minor}/slaves | head -n 1)
# lvm on luks or luks on lvm
@@ -277,6 +278,11 @@ dep_add_modules()
elif [ "${root#/dev/ida/}" != "${root}" ]; then
block=${root#/dev/ida/*}
block="ida!${block%p*}"
+ # loop root /dev/loopX
+ elif [ "${root#/dev/loop}" != "${root}" ]; then
+ root=${root#/dev/}
+ block=$(losetup -a \
+ | awk "/${root}/{print substr(\$3, 7, 3); exit}")
# classical root device
else
block=${root#/dev/}
diff --git a/initramfs-tools.8 b/initramfs-tools.8
index 5e1f083..ea0952b 100644
--- a/initramfs-tools.8
+++ b/initramfs-tools.8
@@ -1,4 +1,4 @@
-.TH INITRAMFS-TOOLS 8 "2008/07/05" "" "mkinitramfs script overview"
+.TH INITRAMFS-TOOLS 8 "2008/12/18" "" "mkinitramfs script overview"
.SH NAME
initramfs-tools \- an introduction to writing scripts for mkinitramfs
@@ -58,7 +58,8 @@ set the root file system type.
\fB\fI nfsroot
can be either "auto" to try to get the relevant information from DHCP or a
string of the form NFSSERVER:NFSPATH or NFSSERVER:NFSPATH:NFSOPTS.
-Use root=/dev/nfs for NFS to kick to in.
+Use root=/dev/nfs for NFS to kick to in. NFSOPTS can be looked up in
+\fInfs(5)\fP.
.TP
\fB\fI ip
diff --git a/scripts/init-top/all_generic_ide b/scripts/init-top/all_generic_ide
index 28b519a..3274ee8 100755
--- a/scripts/init-top/all_generic_ide
+++ b/scripts/init-top/all_generic_ide
@@ -18,5 +18,10 @@ for x in $(cat /proc/cmdline); do
all_generic_ide)
modprobe ide-generic
;;
+ all_generic_ide=*)
+ if [ ${x#all_generic_ide=} ]; then
+ modprobe ide-generic
+ fi
+ ;;
esac
done
diff --git a/update-initramfs.8 b/update-initramfs.8
index 77ebe17..a01ba06 100644
--- a/update-initramfs.8
+++ b/update-initramfs.8
@@ -1,14 +1,13 @@
-.TH UPDATE-INITRAMFS 8 "2006/10/12" "" "update\-initramfs manual"
+.TH UPDATE-INITRAMFS 8 "2008/12/19" "" "update\-initramfs manual"
.SH NAME
update\-initramfs \- generate an initramfs image
.SH SYNOPSIS
.B update\-initramfs
+.RB \-c | \-d | \-u
.RB [ \-k
.IR version ]
-.RB [ \-c ]
-.RB [ \-u ]
.RB [ \-t ]
.RB [ \-v ]
.RB [ \-b ]
Reply to: