Hello community, here is the log from the commit of package mkinitrd checked in at Mon Nov 24 16:09:45 CET 2008. -------- --- mkinitrd/mkinitrd.changes 2008-11-21 13:42:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2008-11-24 12:09:48.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Nov 24 12:07:21 CET 2008 - hare@suse.de + +- Correctly quote variables (bnc#447966) +- Remove stderr redirection from modprobe to display the + actuall error (bnc#441327) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.PoX692/_old 2008-11-24 16:09:03.000000000 +0100 +++ /var/tmp/diff_new_pack.PoX692/_new 2008-11-24 16:09:03.000000000 +0100 @@ -25,7 +25,7 @@ Requires: coreutils modutils util-linux grep gzip sed cpio udev sysvinit file perl-Bootloader AutoReqProv: on Version: 2.4 -Release: 28 +Release: 29 Conflicts: udev < 118 Requires: dhcpcd Summary: Creates an Initial RAM Disk Image for Preloading Modules @@ -112,6 +112,10 @@ %doc %{_mandir}/man8/lsinitrd.8.gz %changelog +* Mon Nov 24 2008 hare@suse.de +- Correctly quote variables (bnc#447966) +- Remove stderr redirection from modprobe to display the + actuall error (bnc#441327) * Fri Nov 21 2008 hare@suse.de - network: use wildcard match for nettype 'dhcp' (bnc#440192) - Update modules script for zfcpdump (bnc#446427) ++++++ mkinitrd.tgz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.4/mkinitrd.changes new/mkinitrd-2.4/mkinitrd.changes --- old/mkinitrd-2.4/mkinitrd.changes 2008-11-21 13:26:11.000000000 +0100 +++ new/mkinitrd-2.4/mkinitrd.changes 2008-11-24 12:08:23.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Nov 24 12:07:21 CET 2008 - hare@suse.de + +- Correctly quote variables (bnc#447966) +- Remove stderr redirection from modprobe to display the + actuall error (bnc#441327) + +------------------------------------------------------------------- Fri Nov 21 10:51:52 CET 2008 - hare@suse.de - network: use wildcard match for nettype 'dhcp' (bnc#440192) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.4/mkinitrd.spec new/mkinitrd-2.4/mkinitrd.spec --- old/mkinitrd-2.4/mkinitrd.spec 2008-11-21 13:26:11.000000000 +0100 +++ new/mkinitrd-2.4/mkinitrd.spec 2008-11-24 12:08:23.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package mkinitrd (Version 2.2) +# spec file for package mkinitrd (Version 2.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,7 +15,7 @@ License: GPL v2 or later Group: System/Base #!BuildIgnore: module-init-tools e2fsprogs udev reiserfs -Requires: coreutils modutils util-linux grep gzip sed cpio udev sysvinit file perl +Requires: coreutils modutils util-linux grep gzip sed cpio udev sysvinit file perl-Bootloader AutoReqProv: on Version: 2.4 Release: 1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.4/scripts/boot-devfunctions.sh new/mkinitrd-2.4/scripts/boot-devfunctions.sh --- old/mkinitrd-2.4/scripts/boot-devfunctions.sh 2008-11-21 13:26:11.000000000 +0100 +++ new/mkinitrd-2.4/scripts/boot-devfunctions.sh 2008-11-24 12:08:23.000000000 +0100 @@ -65,7 +65,7 @@ if [ -n "$root" ]; then echo -n "Waiting for device $root to appear: " while [ $timeout -gt 0 ]; do - if [ -e $root ]; then + if [ -e "$root" ]; then udev_devn=$(devnumber $root) udev_major=$(devmajor $udev_devn) if [ -n "$dm_major" ] ; then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.4/scripts/boot-mount.sh new/mkinitrd-2.4/scripts/boot-mount.sh --- old/mkinitrd-2.4/scripts/boot-mount.sh 2008-11-21 13:26:11.000000000 +0100 +++ new/mkinitrd-2.4/scripts/boot-mount.sh 2008-11-24 12:08:23.000000000 +0100 @@ -65,7 +65,7 @@ sysdev=$(/sbin/udevadm info -q path -n $rootdev) # Fallback if rootdev is not controlled by udev -if [ $? -ne 0 ] && [ -b $rootdev ] ; then +if [ $? -ne 0 ] && [ -b "$rootdev" ] ; then devn=$(devnumber $rootdev) maj=$(devmajor $devn) min=$(devminor $devn) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.4/scripts/setup-modules.sh new/mkinitrd-2.4/scripts/setup-modules.sh --- old/mkinitrd-2.4/scripts/setup-modules.sh 2008-11-21 13:26:11.000000000 +0100 +++ new/mkinitrd-2.4/scripts/setup-modules.sh 2008-11-24 12:08:23.000000000 +0100 @@ -44,15 +44,11 @@ fi module_list=$(/sbin/modprobe $with_modprobe_conf \ --set-version $kernel_version --ignore-install \ - --show-depends $module 2> /dev/null \ + --show-depends $module \ | sed -ne 's:.*insmod /\?::p' | sed -ne 's:\ .*\?::p' ) if [ ! "$module_list" ]; then - # Check for build-in modules - modname=$(echo $module | sed 's/-/_/g') - if [ ! -d /sys/module/$modname ] ; then - echo \ -"WARNING Cannot determine dependencies of kernel module '$module'. - Does it exist? If it does, try depmod -a. Continuing without $module." >&2 + echo \ +"WARNING: no dependencies for kernel module '$module' found." >&2 fi fi for mod in $module_list ; do diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.4/scripts/setup-storage.sh new/mkinitrd-2.4/scripts/setup-storage.sh --- old/mkinitrd-2.4/scripts/setup-storage.sh 2008-11-21 13:26:11.000000000 +0100 +++ new/mkinitrd-2.4/scripts/setup-storage.sh 2008-11-24 12:08:23.000000000 +0100 @@ -52,7 +52,7 @@ # usage majorminor <major> <minor> # returns the block device name majorminor2blockdev() { - local major=$1 minor=$2 + local major=${1:-0} minor=$2 if [ ! "$minor" ]; then minor=$(IFS=: ; set -- $major ; echo $2) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org