Hello community, here is the log from the commit of package mkinitrd checked in at Wed Dec 3 02:17:44 CET 2008. -------- --- mkinitrd/mkinitrd.changes 2008-11-28 17:16:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2008-12-02 18:16:35.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Dec 02 17:41:44 CET 2008 - bwalle@suse.de + +- Don't evaluate 'install' lines in /etc/modprobe.conf and friends + to generate module dependencies. Don't copy over install lines + into the initrd. (bnc #449123) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.G27628/_old 2008-12-03 02:17:27.000000000 +0100 +++ /var/tmp/diff_new_pack.G27628/_new 2008-12-03 02:17:27.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: 33 +Release: 34 Conflicts: udev < 118 Requires: dhcpcd Summary: Creates an Initial RAM Disk Image for Preloading Modules @@ -122,6 +122,10 @@ %doc %{_mandir}/man8/lsinitrd.8.gz %changelog +* Tue Dec 02 2008 bwalle@suse.de +- Don't evaluate 'install' lines in /etc/modprobe.conf and friends + to generate module dependencies. Don't copy over install lines + into the initrd. (bnc #449123) * Fri Nov 28 2008 bwalle@suse.de - Don't use optimised versions of shared libraries on POWER (bnc#448725). ++++++ mkinitrd.tar.bz2 ++++++ 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-28 13:42:42.000000000 +0100 +++ new/mkinitrd-2.4/mkinitrd.changes 2008-12-02 17:59:19.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Dec 02 17:41:44 CET 2008 - bwalle@suse.de + +- Don't evaluate 'install' lines in /etc/modprobe.conf and friends + to generate module dependencies. Don't copy over install lines + into the initrd. (bnc #449123) + +------------------------------------------------------------------- Fri Nov 28 13:32:08 CET 2008 - bwalle@suse.de - Don't use optimised versions of shared libraries on POWER 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-28 13:42:42.000000000 +0100 +++ new/mkinitrd-2.4/scripts/setup-modules.sh 2008-12-02 17:59:19.000000000 +0100 @@ -36,36 +36,25 @@ shift for module in "$@"; do - local with_modprobe_conf - module=${module%.o} # strip trailing ".o" just in case. - module=${module%.ko} # strip trailing ".ko" just in case. - 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 \ - | sed -ne 's:.*insmod /\?::p' | sed -ne 's:\ .*\?::p' ) - if [ ! "$module_list" ]; then - echo \ + module=${module%.o} # strip trailing ".o" just in case. + module=${module%.ko} # strip trailing ".ko" just in case. + + # don't use a modprobe.conf to get rid of the install lines + module_list=$(/sbin/modprobe \ + -C /dev/null \ + --set-version $kernel_version --ignore-install \ + --show-depends $module \ + $additional_args \ + | sed -ne 's:.*insmod /\?::p' | sed -ne 's:\ .*\?::p' ) + if [ ! "$module_list" ]; then + echo \ "WARNING: no dependencies for kernel module '$module' found." >&2 - fi - for mod in $module_list ; do - if ! $(echo $resolved_modules | grep -q $mod) ; then - resolved_modules="$resolved_modules $mod" - fi - done - if [ -f /tmp/mptctl ] ; then - mv /tmp/mptctl /etc/modprobe.d/mptctl - fi + fi + for mod in $module_list ; do + if ! $(echo $resolved_modules | grep -q $mod) ; then + resolved_modules="$resolved_modules $mod" + fi + done done echo $resolved_modules } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.4/scripts/setup-prepare.sh new/mkinitrd-2.4/scripts/setup-prepare.sh --- old/mkinitrd-2.4/scripts/setup-prepare.sh 2008-11-28 13:42:42.000000000 +0100 +++ new/mkinitrd-2.4/scripts/setup-prepare.sh 2008-12-02 17:59:19.000000000 +0100 @@ -145,8 +145,28 @@ # Add modprobe, modprobe.conf*, and a version of /bin/true: modprobe.conf # might use it. -cp -r $root_dir/etc/modprobe.conf $root_dir/etc/modprobe.conf.local \ - $root_dir/etc/modprobe.d $tmp_mnt/etc + +# +# copy each modprobe file without install lines + +mkdir -p "$tmp_mnt/etc/modprobe.d" +if [ -f "$root_dir/etc/modprobe.conf" ] ; then + grep -v ^install "$root_dir/etc/modprobe.conf" > \ + "$tmp_mnt/etc/modprobe.conf" +fi + +if [ -f "$root_dir/etc/modprobe.conf.local" ] ; then + grep -v ^install "$root_dir/etc/modprobe.conf.local" > \ + "$tmp_mnt/etc/modprobe.conf.local" +fi + +if [ -d "$root_dir/etc/modprobe.d" ] ; then + for file in $root_dir/etc/modprobe.d/* ; do + filebase=${file##*/} + grep -v ^install "$file" > "$tmp_mnt/etc/modprobe.d/$filebase" + done +fi + cat > $tmp_mnt/bin/true <<-EOF #! /bin/sh : ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org