Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at 2013-09-04 13:59:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-19 10:51:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes 2013-09-04 13:59:50.000000000 +0200 @@ -1,0 +2,33 @@ +Tue Sep 3 10:38:29 CEST 2013 - [email protected] + +- Fix MODULES_LOADED_ON_BOOT migration, handle unset variable + +------------------------------------------------------------------- +Mon Sep 2 20:51:19 CEST 2013 - [email protected] + +- Use loop instead of ipv6 in check_supported_kernel to avoid + bogus error in mkinitrd.log. loop will most likely remain a + module. + +------------------------------------------------------------------- +Mon Sep 2 19:46:02 CEST 2013 - [email protected] + +- Fix mkinitrd -b <dir> without -k/i option (bnc#510767) + +------------------------------------------------------------------- +Mon Sep 2 13:02:07 UTC 2013 - [email protected] + +- Always include ipv6.ko when iBFT is used (bnc#830621) + +------------------------------------------------------------------- +Fri Aug 30 22:45:38 UTC 2013 - [email protected] + +- Do not ship boot.loadmodules for <= 11.4 (includes SLE11), + because aaa_base owns it + +------------------------------------------------------------------- +Mon Aug 26 12:49:34 UTC 2013 - [email protected] + +- Quote options when parsing them (bnc#835479). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.6mzjOF/_old 2013-09-04 13:59:51.000000000 +0200 +++ /var/tmp/diff_new_pack.6mzjOF/_new 2013-09-04 13:59:51.000000000 +0200 @@ -55,7 +55,7 @@ # don't change it in the build service without sending the author a # pull request or patch first. Otherwise, you risk that your changes will be # silently overwritten by the next submission. -Url: http://gitorious.org/opensuse/mkinitrd +Url: https://github.com/openSUSE/mkinitrd %description Mkinitrd creates file system images for use as initial RAM disk @@ -130,7 +130,10 @@ EOF %if 0%{?suse_version} < 1230 mkdir -p $RPM_BUILD_ROOT/etc/init.d +%if 0%{?suse_version} > 1140 +# This file is in aaa_base in older versions install -m 755 etc/boot.loadmodules $RPM_BUILD_ROOT/etc/init.d/ +%endif 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 @@ -154,12 +157,14 @@ %post %{fillup_only -an kernel} %if 0%{?suse_version} < 1230 +%if 0%{?suse_version} > 1140 %{insserv_force_if_yast /etc/init.d/boot.loadmodules} +%endif %{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}" +if test -n "${MODULES_LOADED_ON_BOOT}" -a "${MODULES_LOADED_ON_BOOT}" != "no" then mkdir -vp /etc/modules-load.d/ f=/etc/modules-load.d/MODULES_LOADED_ON_BOOT.conf @@ -200,7 +205,9 @@ %dir /lib/mkinitrd/setup %config /etc/rpm/macros.mkinitrd %if 0%{?suse_version} < 1230 +%if 0%{?suse_version} > 1140 /etc/init.d/boot.loadmodules +%endif /etc/init.d/purge-kernels %endif %if 0%{?suse_version} >= 1210 ++++++ mkinitrd.tar.bz2 ++++++ 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-08-08 10:47:59.000000000 +0200 +++ new/mkinitrd-2.7.2/mkinitrd.changes 2013-09-03 10:39:47.000000000 +0200 @@ -1,5 +1,38 @@ ------------------------------------------------------------------- -Thu Aug 8 10:21:25 CEST 2013 - [email protected] +Tue Sep 3 10:38:29 CEST 2013 - [email protected] + +- Fix MODULES_LOADED_ON_BOOT migration, handle unset variable + +------------------------------------------------------------------- +Mon Sep 2 20:51:19 CEST 2013 - [email protected] + +- Use loop instead of ipv6 in check_supported_kernel to avoid + bogus error in mkinitrd.log. loop will most likely remain a + module. + +------------------------------------------------------------------- +Mon Sep 2 19:46:02 CEST 2013 - [email protected] + +- Fix mkinitrd -b <dir> without -k/i option (bnc#510767) + +------------------------------------------------------------------- +Mon Sep 2 13:02:07 UTC 2013 - [email protected] + +- Always include ipv6.ko when iBFT is used (bnc#830621) + +------------------------------------------------------------------- +Fri Aug 30 22:45:38 UTC 2013 - [email protected] + +- Do not ship boot.loadmodules for <= 11.4 (includes SLE11), + because aaa_base owns it + +------------------------------------------------------------------- +Mon Aug 26 12:49:34 UTC 2013 - [email protected] + +- Quote options when parsing them (bnc#835479). + +------------------------------------------------------------------- +Thu Aug 8 10:31:25 CEST 2013 - [email protected] - Include /etc/e2fsck.conf to get broken_system_clock=1 (bnc#775268) 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-08-08 10:47:59.000000000 +0200 +++ new/mkinitrd-2.7.2/mkinitrd.spec 2013-09-03 10:39:47.000000000 +0200 @@ -55,7 +55,7 @@ # don't change it in the build service without sending the author a # pull request or patch first. Otherwise, you risk that your changes will be # silently overwritten by the next submission. -Url: http://gitorious.org/opensuse/mkinitrd +Url: https://github.com/openSUSE/mkinitrd %description Mkinitrd creates file system images for use as initial RAM disk @@ -98,7 +98,7 @@ for script in scripts/*.sh; do if ! bash -n $script; then exit 1; - break; + break; fi done @@ -130,7 +130,10 @@ EOF %if 0%{?suse_version} < 1230 mkdir -p $RPM_BUILD_ROOT/etc/init.d +%if 0%{?suse_version} > 1140 +# This file is in aaa_base in older versions install -m 755 etc/boot.loadmodules $RPM_BUILD_ROOT/etc/init.d/ +%endif 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 @@ -154,12 +157,14 @@ %post %{fillup_only -an kernel} %if 0%{?suse_version} < 1230 +%if 0%{?suse_version} > 1140 %{insserv_force_if_yast /etc/init.d/boot.loadmodules} +%endif %{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}" +if test -n "${MODULES_LOADED_ON_BOOT}" -a "${MODULES_LOADED_ON_BOOT}" != "no" then mkdir -vp /etc/modules-load.d/ f=/etc/modules-load.d/MODULES_LOADED_ON_BOOT.conf @@ -200,7 +205,9 @@ %dir /lib/mkinitrd/setup %config /etc/rpm/macros.mkinitrd %if 0%{?suse_version} < 1230 +%if 0%{?suse_version} > 1140 /etc/init.d/boot.loadmodules +%endif /etc/init.d/purge-kernels %endif %if 0%{?suse_version} >= 1210 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.2/sbin/mkinitrd new/mkinitrd-2.7.2/sbin/mkinitrd --- old/mkinitrd-2.7.2/sbin/mkinitrd 2013-08-08 10:47:59.000000000 +0200 +++ new/mkinitrd-2.7.2/sbin/mkinitrd 2013-09-03 10:39:47.000000000 +0200 @@ -194,7 +194,7 @@ kernel_images="" initrd_images="" - for kernel_image in $(ls /boot \ + for kernel_image in $(ls "$boot_dir" \ | sed -ne "\|^$regex\(-[0-9.]\+-[0-9]\+-[a-z0-9]\+$\)\?|p" \ | grep -v kdump$ ) ; do @@ -202,15 +202,15 @@ # script is itself called from within the binary kernel # packages, and rpm does not allow recursive calls. - [ -L "/boot/$kernel_image" ] && continue + [ -L "$boot_dir/$kernel_image" ] && continue [ "${kernel_image%%.gz}" != "$kernel_image" ] && continue - kernel_version=$(kernel_version_from_image "/boot/$kernel_image") + kernel_version=$(kernel_version_from_image "$boot_dir/$kernel_image") initrd_image=$(echo $kernel_image | sed -e "s|${regex}|initrd|") if [ "$kernel_image" != "$initrd_image" -a \ -n "$kernel_version" -a \ -d "/lib/modules/$kernel_version" ]; then - kernel_images="$kernel_images /boot/$kernel_image" - initrd_images="$initrd_images /boot/$initrd_image" + kernel_images="$kernel_images $boot_dir/$kernel_image" + initrd_images="$initrd_images $boot_dir/$initrd_image" fi done } @@ -320,14 +320,14 @@ saved_args=$@ read_options while getopts $( cmd_getopts ) a ; do - case $a in + case "$a" in h) usage exit 0 ;; R) echo "mkinitrd $VERSION" exit 0 ;; - *) if cmd_docmd $a; then + *) if cmd_docmd "$a"; then if next_param; then if $cmd_param_is_array; then eval "$cmd_param_name=\"\$$cmd_param_name $OPTARG\"" @@ -335,7 +335,7 @@ eval "$cmd_param_name='$OPTARG'" fi fi - eval param_$a=1 + read "param_$a" < <(echo 1) else exit 1 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.2/scripts/boot-ibft.sh new/mkinitrd-2.7.2/scripts/boot-ibft.sh --- old/mkinitrd-2.7.2/scripts/boot-ibft.sh 2013-08-08 10:47:59.000000000 +0200 +++ new/mkinitrd-2.7.2/scripts/boot-ibft.sh 2013-09-03 10:39:47.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash #%stage: device -#%modules: iscsi_ibft +#%modules: iscsi_ibft ipv6 #%programs: cat #%if: "$ibft_available" #: ${ibft_nic:=/sys/firmware/ibft/ethernet0} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.2/scripts/setup-modules.sh new/mkinitrd-2.7.2/scripts/setup-modules.sh --- old/mkinitrd-2.7.2/scripts/setup-modules.sh 2013-08-08 10:47:59.000000000 +0200 +++ new/mkinitrd-2.7.2/scripts/setup-modules.sh 2013-09-03 10:39:47.000000000 +0200 @@ -74,7 +74,7 @@ local kernel_version=$1 local output= - output=$(modinfo -k "$kernel_version" -F supported ipv6 2>/dev/null) + output=$(modinfo -k "$kernel_version" -F supported loop 2>/dev/null) if [ "$?" -ne 0 ] ; then # If the command existed with an error, assume that the kernel is # supported. That is just the same behaviour as before we did that -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
