Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at 2013-08-04 16:58:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old) and /work/SRC/openSUSE:Factory/.mkinitrd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mkinitrd" Changes: -------- --- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes 2013-08-01 06:54:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes 2013-08-04 16:58:28.000000000 +0200 @@ -1,0 +2,11 @@ +Sun Aug 4 10:47:08 CEST 2013 - ohering@suse.de + +- Fix parsing of disabled modules in RESOLVED_INITRD_MODULES (bnc#696959) + +------------------------------------------------------------------- +Wed Jul 31 19:47:41 CEST 2013 - ohering@suse.de + +- Migrate /etc/sysconfig/kernel:MODULES_LOADED_ON_BOOT to + /etc/modules-load.d/MODULES_LOADED_ON_BOOT.conf (bnc#768423) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.q0qeb7/_old 2013-08-04 16:58:29.000000000 +0200 +++ /var/tmp/diff_new_pack.q0qeb7/_new 2013-08-04 16:58:29.000000000 +0200 @@ -109,8 +109,6 @@ mkdir -p $RPM_BUILD_ROOT/lib/mkinitrd/setup mkdir -p $RPM_BUILD_ROOT/lib/mkinitrd/boot mkdir -p $RPM_BUILD_ROOT/lib/mkinitrd/bin -mkdir -p $RPM_BUILD_ROOT/etc/init.d -mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates cp -a scripts/*.sh $RPM_BUILD_ROOT/lib/mkinitrd/scripts/ for i in lib/mkinitrd/bin/* do @@ -130,8 +128,12 @@ # %install_mkinitrd /usr/bin/perl /sbin/mkinitrd_setup EOF +%if 0%{?suse_version} < 1230 +mkdir -p $RPM_BUILD_ROOT/etc/init.d install -m 755 etc/boot.loadmodules $RPM_BUILD_ROOT/etc/init.d/ install -m 755 etc/purge-kernels.init $RPM_BUILD_ROOT/etc/init.d/purge-kernels +%endif +mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates install -m 644 etc/sysconfig.kernel-mkinitrd $RPM_BUILD_ROOT/var/adm/fillup-templates/ %if 0%{?suse_version} >= 1210 @@ -151,8 +153,27 @@ %post %{fillup_only -an kernel} +%if 0%{?suse_version} < 1230 %{insserv_force_if_yast /etc/init.d/boot.loadmodules} %{fillup_and_insserv -f -Y purge-kernels} +%endif +%if 0%{?suse_version} >= 1230 +%{remove_and_set -n kernel MODULES_LOADED_ON_BOOT} +if test -n "${MODULES_LOADED_ON_BOOT}" +then + mkdir -vp /etc/modules-load.d/ + f=/etc/modules-load.d/MODULES_LOADED_ON_BOOT.conf + if test -f "${f}" + then + echo "${f} already exists. Module list: '${MODULES_LOADED_ON_BOOT}'" + else + for mod in ${MODULES_LOADED_ON_BOOT} + do + echo "${mod}" + done > "${f}" + fi +fi +%endif %if 0%{?suse_version} >= 1210 %service_add_post purge-kernels.service %endif @@ -178,8 +199,10 @@ %dir /lib/mkinitrd/boot %dir /lib/mkinitrd/setup %config /etc/rpm/macros.mkinitrd +%if 0%{?suse_version} < 1230 /etc/init.d/boot.loadmodules /etc/init.d/purge-kernels +%endif %if 0%{?suse_version} >= 1210 %_unitdir/purge-kernels.service %endif ++++++ mkinitrd.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.2/etc/sysconfig.kernel-mkinitrd new/mkinitrd-2.7.2/etc/sysconfig.kernel-mkinitrd --- old/mkinitrd-2.7.2/etc/sysconfig.kernel-mkinitrd 2013-07-31 17:44:01.000000000 +0200 +++ new/mkinitrd-2.7.2/etc/sysconfig.kernel-mkinitrd 2013-08-04 10:47:54.000000000 +0200 @@ -31,16 +31,6 @@ # DOMU_INITRD_MODULES="xennet xenblk" -## Type: string -## ServiceRestart: boot.loadmodules -# -# This variable contains the list of modules to be loaded -# once the main filesystem is active -# You will find a few default modules for hardware which -# can not be detected automatically. -# -MODULES_LOADED_ON_BOOT="" - ## Type: string ## Default: "" # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.2/mkinitrd.changes new/mkinitrd-2.7.2/mkinitrd.changes --- old/mkinitrd-2.7.2/mkinitrd.changes 2013-07-31 17:44:01.000000000 +0200 +++ new/mkinitrd-2.7.2/mkinitrd.changes 2013-08-04 10:47:54.000000000 +0200 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Sun Aug 4 10:47:08 CEST 2013 - ohering@suse.de + +- Fix parsing of disabled modules in RESOLVED_INITRD_MODULES (bnc#696959) + +------------------------------------------------------------------- +Wed Jul 31 19:47:41 CEST 2013 - ohering@suse.de + +- Migrate /etc/sysconfig/kernel:MODULES_LOADED_ON_BOOT to + /etc/modules-load.d/MODULES_LOADED_ON_BOOT.conf (bnc#768423) + +------------------------------------------------------------------- Wed Jul 31 17:42:59 CEST 2013 - ohering@suse.de - Remove useless console output before starting splash (doing fast diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.2/mkinitrd.spec new/mkinitrd-2.7.2/mkinitrd.spec --- old/mkinitrd-2.7.2/mkinitrd.spec 2013-07-31 17:44:01.000000000 +0200 +++ new/mkinitrd-2.7.2/mkinitrd.spec 2013-08-04 10:47:54.000000000 +0200 @@ -109,8 +109,6 @@ mkdir -p $RPM_BUILD_ROOT/lib/mkinitrd/setup mkdir -p $RPM_BUILD_ROOT/lib/mkinitrd/boot mkdir -p $RPM_BUILD_ROOT/lib/mkinitrd/bin -mkdir -p $RPM_BUILD_ROOT/etc/init.d -mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates cp -a scripts/*.sh $RPM_BUILD_ROOT/lib/mkinitrd/scripts/ for i in lib/mkinitrd/bin/* do @@ -130,8 +128,12 @@ # %install_mkinitrd /usr/bin/perl /sbin/mkinitrd_setup EOF +%if 0%{?suse_version} < 1230 +mkdir -p $RPM_BUILD_ROOT/etc/init.d install -m 755 etc/boot.loadmodules $RPM_BUILD_ROOT/etc/init.d/ install -m 755 etc/purge-kernels.init $RPM_BUILD_ROOT/etc/init.d/purge-kernels +%endif +mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates install -m 644 etc/sysconfig.kernel-mkinitrd $RPM_BUILD_ROOT/var/adm/fillup-templates/ %if 0%{?suse_version} >= 1210 @@ -151,8 +153,27 @@ %post %{fillup_only -an kernel} +%if 0%{?suse_version} < 1230 %{insserv_force_if_yast /etc/init.d/boot.loadmodules} %{fillup_and_insserv -f -Y purge-kernels} +%endif +%if 0%{?suse_version} >= 1230 +%{remove_and_set -n kernel MODULES_LOADED_ON_BOOT} +if test -n "${MODULES_LOADED_ON_BOOT}" +then + mkdir -vp /etc/modules-load.d/ + f=/etc/modules-load.d/MODULES_LOADED_ON_BOOT.conf + if test -f "${f}" + then + echo "${f} already exists. Module list: '${MODULES_LOADED_ON_BOOT}'" + else + for mod in ${MODULES_LOADED_ON_BOOT} + do + echo "${mod}" + done > "${f}" + fi +fi +%endif %if 0%{?suse_version} >= 1210 %service_add_post purge-kernels.service %endif @@ -178,8 +199,10 @@ %dir /lib/mkinitrd/boot %dir /lib/mkinitrd/setup %config /etc/rpm/macros.mkinitrd +%if 0%{?suse_version} < 1230 /etc/init.d/boot.loadmodules /etc/init.d/purge-kernels +%endif %if 0%{?suse_version} >= 1210 %_unitdir/purge-kernels.service %endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.2/scripts/setup-start.sh new/mkinitrd-2.7.2/scripts/setup-start.sh --- old/mkinitrd-2.7.2/scripts/setup-start.sh 2013-07-31 17:44:01.000000000 +0200 +++ new/mkinitrd-2.7.2/scripts/setup-start.sh 2013-08-04 10:47:54.000000000 +0200 @@ -60,6 +60,10 @@ RESOLVED_INITRD_MODULES_UDEV= RESOLVED_INITRD_MODULES_NEW= for m in $RESOLVED_INITRD_MODULES ; do + # cut out all modules which have a minus preceding them + case "$m" in + -*) continue ;; + esac if [ $(modinfo -k $kernel_version -F firmware $m 2> /dev/null | wc -l) -gt 0 ] ; then verbose "[SETUP]\tDon't load $m on boot with modprobe because "\ "it requires firmware" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org