Hello community, here is the log from the commit of package mkinitrd checked in at Tue Nov 25 16:30:09 CET 2008. -------- --- mkinitrd/mkinitrd.changes 2008-11-25 09:17:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2008-11-25 16:24:35.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 25 16:21:37 CET 2008 - hare@suse.de + +- Work around mptctl install lines (bnc#448716) +- Add syntax checker + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.D18195/_old 2008-11-25 16:29:31.000000000 +0100 +++ /var/tmp/diff_new_pack.D18195/_new 2008-11-25 16:29:31.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: 31 +Release: 32 Conflicts: udev < 118 Requires: dhcpcd Summary: Creates an Initial RAM Disk Image for Preloading Modules @@ -64,6 +64,16 @@ %build gcc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c sed -i "s/@BUILD_DAY@/`env LC_ALL=C date -ud yesterday '+%Y%m%d'`/" sbin/mkinitrd +echo "Checking scripts:" +if ! bash -n sbin/mkinitrd; then + exit 1 +fi +for script in scripts/*.sh; do + if ! bash -n $script; then + exit 1; + break; + fi +done %install mkdir -p $RPM_BUILD_ROOT/usr/share/mkinitrd @@ -113,6 +123,9 @@ %changelog * Tue Nov 25 2008 hare@suse.de +- Work around mptctl install lines (bnc#448716) +- Add syntax checker +* Tue Nov 25 2008 hare@suse.de - Fix syntax error in modules script (bnc#448511) - Setup network devices correctly (bnc#448395) * Mon Nov 24 2008 hare@suse.de ++++++ 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-25 09:16:47.000000000 +0100 +++ new/mkinitrd-2.4/mkinitrd.changes 2008-11-25 16:22:26.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 25 16:21:37 CET 2008 - hare@suse.de + +- Work around mptctl install lines (bnc#448716) +- Add syntax checker + +------------------------------------------------------------------- Tue Nov 25 08:54:55 CET 2008 - hare@suse.de - Fix syntax error in modules script (bnc#448511) 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-25 09:16:47.000000000 +0100 +++ new/mkinitrd-2.4/mkinitrd.spec 2008-11-25 16:22:26.000000000 +0100 @@ -57,6 +57,16 @@ %build gcc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c sed -i "s/@BUILD_DAY@/`env LC_ALL=C date -ud yesterday '+%Y%m%d'`/" sbin/mkinitrd +echo "Checking scripts:" +if ! bash -n sbin/mkinitrd; then + exit 1 +fi +for script in scripts/*.sh; do + if ! bash -n $script; then + exit 1; + break; + fi +done %install mkdir -p $RPM_BUILD_ROOT/usr/share/mkinitrd 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-25 09:16:47.000000000 +0100 +++ new/mkinitrd-2.4/scripts/setup-modules.sh 2008-11-25 16:22:26.000000000 +0100 @@ -42,6 +42,14 @@ if [ -e /etc/modprobe.conf ]; then with_modprobe_conf="-C /etc/modprobe.conf" fi + case "$module" in + mpt*) + if [ -f /etc/modprobe.d/mptctl ] ; then + rm -f $tmp_mnt/etc/modprobe.d/mptctl + mv /etc/modprobe.d/mptctl /tmp + fi + ;; + esac module_list=$(/sbin/modprobe $with_modprobe_conf \ --set-version $kernel_version --ignore-install \ --show-depends $module \ @@ -55,6 +63,9 @@ resolved_modules="$resolved_modules $mod" fi done + if [ -f /tmp/mptctl ] ; then + mv /tmp/mptctl /etc/modprobe.d/mptctl + fi done echo $resolved_modules } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org