hint initramfs-tools 0.92g
hello,
please hint initramfs-tools 0.92g into Lenny.
it has 3 important fixes to future proof it.
The first is to use correct udev binary for upgrades from Lenny to Squeeze.
The second adds ext4* modules to initramfs so that ext4 root is possible,
with Lenny+half kernel that may be very well desirable and doesn't add
that much to a generic initramfs (fstype already recons ext4dev).
The third fixes a panic due to syntax error for OLPC boot.
OLPC support isn't there yet, but at least it doesn't explode.
thanks dannf for reviewing belows diff.
kind regards
maks
diff --git a/debian/changelog b/debian/changelog
index f0bd7d3..60f4cc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+initramfs-tools (0.92g) unstable; urgency=high
+
+ [ maximilian attems ]
+ * wait_for_udev: s/udevsettle/udevadm/ for upgrades after Lenny.
+ * auto_add_modules: Add ext4 and ext4dev. (closes: #494922)
+
+ [ Andres Salomon ]
+ * Fix parse_numeric() to ignore non hex root string prefixes aka
+ root=mtd0 on OLPC. see #497133
+
+ -- maximilian attems <maks@debian.org> Tue, 02 Sep 2008 17:50:32 +0200
+
initramfs-tools (0.92f) unstable; urgency=medium
[ maximilian attems ]
diff --git a/hook-functions b/hook-functions
index 7d2e6da..8bbbbd4 100644
--- a/hook-functions
+++ b/hook-functions
@@ -317,8 +317,8 @@ auto_add_modules()
case "$1" in
base)
for x in ehci-hcd ohci-hcd uhci-hcd usbhid usb-storage ext2 \
- ext3 isofs jfs nfs reiserfs udf xfs af_packet atkbd i8042 \
- virtio_pci; do
+ ext3 ext4 ext4dev isofs jfs nfs reiserfs udf xfs af_packet \
+ atkbd i8042 virtio_pci; do
manual_add_modules "${x}"
done
;;
diff --git a/scripts/functions b/scripts/functions
index 5a896f1..299c29c 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -242,11 +242,14 @@ parse_numeric() {
minor=${1#*:}
major=${1%:*}
;;
- *)
+ [A-Fa-f0-9]*)
value=$(( 0x${1} ))
minor=$(( ${value} % 256 ))
major=$(( ${value} / 256 ))
;;
+ *)
+ return
+ ;;
esac
mknod -m 600 /dev/root b ${major} ${minor}
@@ -300,6 +303,6 @@ configure_networking()
# Wait for queued kernel/udev events
wait_for_udev()
{
- [ -x "$(command -v udevsettle)" ] && return 0
- udevsettle ${1:+--timeout=$1}
+ [ -x "$(command -v udevadm)" ] && return 0
+ udevadm settle ${1:+--timeout=$1}
}
Reply to: