hello dannf, please review belows ack for an testing update of initramfs-tools. important part is the boot fix by tbm and the flash-kernel invocation by update-initramfs. rest is minor code/doc fixes.
thanks -- maks diff --git a/debian/changelog b/debian/changelog index 968f32f..f0bd7d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +initramfs-tools (0.92f) unstable; urgency=medium + + [ maximilian attems ] + * mkinitramfs: only lvm2 initramfs has busybox dep. (closes: #490875) + * mkinitramfs: Fix usage and man outfile arg is not optional. + (closes: #493238) + * preinst fix vol_id path. (closes: #494433) + * update-initramfs: run_bootloader() invoke flash-kernel and glantank- + update-kernel in order to have latest initramfs flashed on triggered + update. Thanks to Joey Hess <[EMAIL PROTECTED]>. + * debian/control: Newer standards version without changes. + + [ Chris Lamb ] + * make log_begin_msg not emit trailing newline (closes: #494257) + + [ Martin Michlmayr ] + * MODULES=dep boot fix for Orion. (closes: #494027) + + -- maximilian attems <[EMAIL PROTECTED]> Tue, 12 Aug 2008 11:09:11 +0200 + initramfs-tools (0.92e) unstable; urgency=medium * udevhelper hook: drop ide.agent. diff --git a/debian/control b/debian/control index 39a1134..4986dea 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Uploaders: Jeff Bailey <[EMAIL PROTECTED]>, maximilian attems <[EMAIL PROTECTED]>, David Härdeman <[EMAIL PROTECTED]> Maintainer: Debian kernel team <[EMAIL PROTECTED]> Build-Depends: debhelper (>= 4.1.0), cdbs -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 Vcs-Browser: http://git.debian.org/?p=kernel/initramfs-tools.git Vcs-Git: git://git.debian.org/git/kernel/initramfs-tools.git diff --git a/debian/initramfs-tools.preinst b/debian/initramfs-tools.preinst index 3cf477e..758b504 100644 --- a/debian/initramfs-tools.preinst +++ b/debian/initramfs-tools.preinst @@ -23,7 +23,7 @@ case "$1" in if [ -x /sbin/vol_id ]; then UUID=$(/sbin/vol_id -u "$RESUME" || true) elif [ -x /lib/udev/vol_id ]; then - UUID=$(/sbin/vol_id -u "$RESUME" || true) + UUID=$(/lib/udev/vol_id -u "$RESUME" || true) fi if [ -n "$UUID" ]; then RESUME="UUID=$UUID" diff --git a/hook-functions b/hook-functions index 3975cd9..7d2e6da 100644 --- a/hook-functions +++ b/hook-functions @@ -189,6 +189,7 @@ sys_walk_mod_add() device_path="$1" while [ "${device_path}" != "/sys" ]; do + sys_walk_modalias ${device_path} driver_path="$(readlink -f ${device_path}/driver)" if [ -e "$driver_path" ]; then module="$(basename $(readlink -f $driver_path))" @@ -393,7 +394,7 @@ usage() { cat >&2 << EOF -Usage: ${0} [OPTION]... <-o outfile> [version] +Usage: ${0} [OPTION]... -o outfile [version] Options: -d confdir Specify an alternative configuration directory. diff --git a/mkinitramfs b/mkinitramfs index 312b99e..0fc45db 100755 --- a/mkinitramfs +++ b/mkinitramfs @@ -258,8 +258,7 @@ if [ "${BUSYBOX}" = "n" ] || [ ! -e ${BUSYBOXDIR}/busybox ]; then mv ${DESTDIR}/bin/sh.shared ${DESTDIR}/bin/sh # those root need busybox eval "$(mount | awk '/ \/ / {print "r_dev=" $1; exit}')" - if [ "${r_dev#/dev/mapper/}" != "${r_dev}" ] \ - || [ "${r_dev#/dev/md}" != "${r_dev}" ]; then + if [ "${r_dev#/dev/mapper/}" != "${r_dev}" ]; then echo "Warning: Busybox is required for successful boot!" fi else diff --git a/mkinitramfs.8 b/mkinitramfs.8 index 8d94a8c..abb3f39 100644 --- a/mkinitramfs.8 +++ b/mkinitramfs.8 @@ -1,4 +1,4 @@ -.TH MKINITRAMFS 8 "2007/08/08" "" "mkinitramfs manual" +.TH MKINITRAMFS 8 "2008/08/12" "" "mkinitramfs manual" .SH NAME mkinitramfs \- low-level tool for generating an initramfs image @@ -8,8 +8,8 @@ mkinitramfs \- low-level tool for generating an initramfs image .RB [ \-d .IR confdir ] .RB [ \-k ] -.RB [ \-o -.IR outfile ] +.RB \-o +.IR outfile .RB [ \-r .IR root ] .RB [ \-v ] diff --git a/scripts/functions b/scripts/functions index a004c9e..5a896f1 100644 --- a/scripts/functions +++ b/scripts/functions @@ -3,22 +3,22 @@ _log_msg() { if [ "$quiet" = "y" ]; then return; fi - echo "$@" + printf "$@" } log_success_msg() { - _log_msg "Success: $@" + _log_msg "Success: [EMAIL PROTECTED]" } log_failure_msg() { - _log_msg "Failure: $@" + _log_msg "Failure: [EMAIL PROTECTED]" } log_warning_msg() { - _log_msg "Warning: $@" + _log_msg "Warning: [EMAIL PROTECTED]" } log_begin_msg() @@ -26,7 +26,7 @@ log_begin_msg() if [ -x /sbin/usplash_write ]; then /sbin/usplash_write "TEXT $@" fi - _log_msg "Begin: $@ ..." + _log_msg "Begin: $@ ... " } log_end_msg() @@ -34,7 +34,7 @@ log_end_msg() if [ -x /sbin/usplash_write ]; then /sbin/usplash_write "SUCCESS ok" fi - _log_msg "Done." + _log_msg "done.\n" } panic() diff --git a/update-initramfs b/update-initramfs index 6f978f3..9830a7d 100755 --- a/update-initramfs +++ b/update-initramfs @@ -262,6 +262,12 @@ run_bootloader() if [ -r /etc/zipl.conf ]; then zipl fi + if flash-kernel --supported >/dev/null 2>&1; then + flash-kernel + fi + if glantank-update-kernel --supported >/dev/null 2>&1; then + glantank-update-kernel + fi } compare_sha1() -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
