* fix minor parsing

* add linear module
* manpage polishing
* udev_helper needs some conf sourced

6 files changed, 33 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index 3edb850..c67e009 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+initramfs-tools (0.56) unstable; urgency=low
+
+  * hooks/md: Add linear module - thanks to Moshe Yudkowsky <moshe@pobox.com>.
+
+  * scripts/functions: Fix numerical minor parsing - thanks for the patch to
+    Wolfgang Weisselberg. (closes: #357332)
+
+  * mkinitramfs.8: Correct wrong referenced filename.
+
+  * update-initramfs.8: Define the argument 'version' - thanks to "Susan G.
+    Kleinmann" <sgk@debian.org>. (closes: #357282)
+
+  * scripts/init-premount/udev_helper: Source the relevant definition to get
+    it really run. Thanks to Maurice Massar <massar@unix-ag.uni-kl.de>.
+    (closes: #354458)
+
+ -- maximilian attems <maks@sternwelten.at>  Fri, 17 Mar 2006 19:09:11 +0100
+
+initramfs-tools (0.55b) unstable; urgency=low
+
+  * Thanks to Frederik Schüler for pointing to leftovers.
+
+ -- maximilian attems <maks@sternwelten.at>  Wed, 15 Mar 2006 13:23:51 +0100
+
 initramfs-tools (0.55) unstable; urgency=low
 
   * scripts/init-premount/udev_helper: Fix modprobe args.
diff --git a/hooks/md b/hooks/md
index 64b8f9e..c020c3a 100755
--- a/hooks/md
+++ b/hooks/md
@@ -23,6 +23,6 @@ fi
 copy_exec /sbin/mdadm /sbin
 copy_exec /sbin/mdrun /sbin
 
-for x in md raid0 raid1 raid5 raid6; do
+for x in md linear raid0 raid1 raid5 raid6; do
         manual_add_modules ${x}
 done
diff --git a/mkinitramfs.8 b/mkinitramfs.8
index b0da75e..539c4c0 100644
--- a/mkinitramfs.8
+++ b/mkinitramfs.8
@@ -53,7 +53,7 @@ Write the image to
 Override the 
 .B ROOT 
 setting in 
-.IR mkinitramfs.conf .
+.IR initramfs.conf .
 
 .TP
 \fB\-\-supported-host-version=\fIhversion
diff --git a/scripts/functions b/scripts/functions
index 6825519..05b7779 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -202,7 +202,7 @@ parse_numeric() {
 		major=${1%:*}
 		;;
 	*)
-		minor=$((0x${1#??}))
+		minor=$((0x${1#?}))
 		major=$((0x${1%??}))
 		;;
 	esac
diff --git a/scripts/init-premount/udev_helper b/scripts/init-premount/udev_helper
index f2bc204..d2ef579 100755
--- a/scripts/init-premount/udev_helper
+++ b/scripts/init-premount/udev_helper
@@ -15,6 +15,10 @@ prereqs)
 	;;
 esac
 
+# Source the relevant scripts for later decisions
+. /conf/initramfs.conf
+. /scripts/functions
+
 # Nothing todo for nfs boot
 case "${BOOT}" in
 local)
diff --git a/update-initramfs.8 b/update-initramfs.8
index 9e107e9..7ab8b3f 100644
--- a/update-initramfs.8
+++ b/update-initramfs.8
@@ -28,7 +28,8 @@ happens in this early userspace.
 .SH OPTIONS
 .TP
 \fB \-k \fI version
-Set the kernel for whom the initramfs will be generated.
+Set the kernel version for whom the initramfs will be generated.
+For example the output of uname -r for your currently running kernel.
 
 .TP
 \fB \-c