Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at 2013-03-22 12:04:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old) and /work/SRC/openSUSE:Factory/.mkinitrd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mkinitrd", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes 2013-02-04 19:06:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes 2013-03-22 12:04:53.000000000 +0100 @@ -2 +2 @@ -Fri Feb 1 17:46:57 UTC 2013 - [email protected] +Thu Mar 21 10:02:09 UTC 2013 - [email protected] @@ -4,2 +4,49 @@ -- Fix boolean typo that is assume local time as default in warpclock - as we check for UTC in /etc/adjtime (related to bnc#779145) +- Use the default gzip compression level (bnc#809742). + +------------------------------------------------------------------- +Fri Mar 15 14:49:36 UTC 2013 - [email protected] + +- Do not refresh the bootloader if no kernels are installed + (bnc#804398). + +------------------------------------------------------------------- +Fri Mar 15 10:56:16 UTC 2013 - [email protected] + +- Skip static interfaces when configuring dhcp interfaces + (bnc#755642). + +------------------------------------------------------------------- +Fri Mar 15 10:42:01 UTC 2013 - [email protected] + +- Fix boot from mdraid on top of multipath devices (bnc#784613) + +------------------------------------------------------------------- +Tue Mar 12 16:17:20 CET 2013 - [email protected] + +- Handle both rootfsopts and rootflags when looking for mount options + +------------------------------------------------------------------- +Wed Mar 6 19:40:12 CET 2013 - [email protected] + +- Include hyperv_fb if running in hyper-v guest (fate#314862) + +------------------------------------------------------------------- +Wed Feb 27 19:41:38 CET 2013 - [email protected] + +- Add support for zImage on ARM + +------------------------------------------------------------------- +Tue Feb 26 16:11:51 UTC 2013 - [email protected] + +- Fix typo in man lsinitrd. + +------------------------------------------------------------------- +Mon Feb 25 14:27:14 UTC 2013 - [email protected] + +- Do not tell the user to refresh the bootloader when generating the + kdump initrd. Also, fix the wording of the message (bnc#801984). + +------------------------------------------------------------------- +Fri Feb 1 19:04:15 CET 2013 - [email protected] + +- Fix boolean typo that is assume local time as default in warpclock. @@ -10,0 +58,6 @@ + +------------------------------------------------------------------- +Mon Dec 17 14:55:27 UTC 2012 - [email protected] + +- Handle moving ibft interface between interfaces and subnets + (bnc#755642). Old: ---- mkinitrd-2.7.2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.i1xIY9/_old 2013-03-22 12:04:54.000000000 +0100 +++ /var/tmp/diff_new_pack.i1xIY9/_new 2013-03-22 12:04:54.000000000 +0100 @@ -51,8 +51,6 @@ Group: System/Base BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mkinitrd.tar.bz2 -# PATCH-FIX-OPENSUSE mkinitrd-2.7.2.patch (bnc#779145) -Patch0: mkinitrd-2.7.2.patch # Note: the whole package is maintained in this git repository, please # 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 @@ -87,7 +85,6 @@ %prep %setup -%patch0 %build %__cc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c ++++++ mkinitrd.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.2/.gitignore new/mkinitrd-2.7.2/.gitignore --- old/mkinitrd-2.7.2/.gitignore 2012-12-17 17:11:40.000000000 +0100 +++ new/mkinitrd-2.7.2/.gitignore 2013-03-21 11:16:00.000000000 +0100 @@ -1 +1,3 @@ *.marks +diff_* +Session*.vim diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.2/build_rpm new/mkinitrd-2.7.2/build_rpm --- old/mkinitrd-2.7.2/build_rpm 2012-12-17 17:11:40.000000000 +0100 +++ new/mkinitrd-2.7.2/build_rpm 2013-03-21 11:16:00.000000000 +0100 @@ -60,7 +60,15 @@ exit 1 fi -rm -f "$DESTDIR"/* +if test -f "$DESTDIR"/_link ; then + osc_link="`mktemp`" + cat "$DESTDIR"/_link > "$osc_link" + rm -f "$DESTDIR"/* + cat "$osc_link" > "$DESTDIR"/_link + rm -f "$osc_link" +else + rm -f "$DESTDIR"/* +fi if ! mkdir -p $DESTDIR ; then echo "Cannot create directory $DESTDIR" exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.2/man/lsinitrd.8.txt new/mkinitrd-2.7.2/man/lsinitrd.8.txt --- old/mkinitrd-2.7.2/man/lsinitrd.8.txt 2012-12-17 17:11:40.000000000 +0100 +++ new/mkinitrd-2.7.2/man/lsinitrd.8.txt 2013-03-21 11:16:00.000000000 +0100 @@ -58,7 +58,7 @@ *-c*:: Shows the contents of the configuration files (the _config_ directory in - the initrd). Useuful for debugging. + the initrd). Useful for debugging. Authors ------- 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 2012-12-17 17:11:40.000000000 +0100 +++ new/mkinitrd-2.7.2/mkinitrd.changes 2013-03-21 11:16:00.000000000 +0100 @@ -1,9 +1,68 @@ ------------------------------------------------------------------- +Thu Mar 21 10:02:09 UTC 2013 - [email protected] + +- Use the default gzip compression level (bnc#809742). + +------------------------------------------------------------------- +Fri Mar 15 14:49:36 UTC 2013 - [email protected] + +- Do not refresh the bootloader if no kernels are installed + (bnc#804398). + +------------------------------------------------------------------- +Fri Mar 15 10:56:16 UTC 2013 - [email protected] + +- Skip static interfaces when configuring dhcp interfaces + (bnc#755642). + +------------------------------------------------------------------- +Fri Mar 15 10:42:01 UTC 2013 - [email protected] + +- Fix boot from mdraid on top of multipath devices (bnc#784613) + +------------------------------------------------------------------- +Tue Mar 12 16:17:20 CET 2013 - [email protected] + +- Handle both rootfsopts and rootflags when looking for mount options + +------------------------------------------------------------------- +Wed Mar 6 19:40:12 CET 2013 - [email protected] + +- Include hyperv_fb if running in hyper-v guest (fate#314862) + +------------------------------------------------------------------- +Wed Feb 27 19:41:38 CET 2013 - [email protected] + +- Add support for zImage on ARM + +------------------------------------------------------------------- +Tue Feb 26 16:11:51 UTC 2013 - [email protected] + +- Fix typo in man lsinitrd. + +------------------------------------------------------------------- +Mon Feb 25 14:27:14 UTC 2013 - [email protected] + +- Do not tell the user to refresh the bootloader when generating the + kdump initrd. Also, fix the wording of the message (bnc#801984). + +------------------------------------------------------------------- +Fri Feb 1 19:04:15 CET 2013 - [email protected] + +- Fix boolean typo that is assume local time as default in warpclock. + +------------------------------------------------------------------- Mon Dec 17 16:07:27 UTC 2012 - [email protected] - Fix typo in purge-kernels.service (bnc#792925). ------------------------------------------------------------------- +Mon Dec 17 14:55:27 UTC 2012 - [email protected] + +- Handle moving ibft interface between interfaces and subnets + (bnc#755642). + +------------------------------------------------------------------- Fri Dec 7 05:16:54 CET 2012 - [email protected] - mkinitrd: copy firmware signature files to initrd (fate#314574). 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 2012-12-17 17:11:40.000000000 +0100 +++ new/mkinitrd-2.7.2/mkinitrd.spec 2013-03-21 11:16:00.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mkinitrd # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed 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 2012-12-17 17:11:40.000000000 +0100 +++ new/mkinitrd-2.7.2/sbin/mkinitrd 2013-03-21 11:16:00.000000000 +0100 @@ -138,8 +138,24 @@ exit } +kernel_image_gz_from_image() { + local arch=$(uname -i) + local r=${1}.gz + + # uImage kernels can't be extracted directly. Use the vmlinux.gz instead + r=${r//uImage/vmlinux} + + # on ARM a zImage can't be extracted directly. Other platforms define it + # as a gzipped vmlinux file, but not ARM. So only on ARM, use vmlinux.gz. + if [[ $arch =~ arm ]] || [[ $arch =~ aarch ]]; then + r=${r//zImage/vmlinux} + fi + + echo $r +} + kernel_version_from_image() { - local kernel_image=$1 kernel_image_gz=${1//uImage/vmlinux}.gz + local kernel_image=$1 kernel_image_gz=$(kernel_image_gz_from_image $1) if get_kernel_version "$kernel_image" 2>/dev/null; then return @@ -162,7 +178,7 @@ regex='vmlinuz' ;; arm*) - regex='uImage' + regex='[uz]Image' ;; *) regex='vmlinu.' ;; @@ -521,6 +537,11 @@ mkinitrd_setup fi +if test ${#kernel_images[@]} -eq 0; then + cleanup_finish + exit 0 +fi + #boot_modules="$modules" #echo -e "User-defined Module list:\t$boot_modules ($domu_modules)" for ((i=0 ; $i<${#kernel_images[@]} ; i++)); do @@ -567,8 +588,12 @@ update-bootloader --refresh exit_code=$? else - echo 2>&1 "Don't refresh the bootloader. You may have to do " \ - "that manually!" + case " $ADDITIONAL_FEATURES " in + *\ kdump\ *) + ;; + *) + echo 2>&1 "Did not refresh the bootloader. You might need to refresh it manually." + esac fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.2/scripts/boot-devfunctions.sh new/mkinitrd-2.7.2/scripts/boot-devfunctions.sh --- old/mkinitrd-2.7.2/scripts/boot-devfunctions.sh 2012-12-17 17:11:40.000000000 +0100 +++ new/mkinitrd-2.7.2/scripts/boot-devfunctions.sh 2013-03-21 11:16:00.000000000 +0100 @@ -71,6 +71,11 @@ if [ -e "$root" ]; then udev_devn=$(devnumber $root) udev_major=$(devmajor $udev_devn) + if [ -n "$md_major" -a "$udev_major" = "$md_major" ] ; then + echo " ok" + retval=0 + break; + fi if [ -n "$dm_major" ] ; then if [ "$udev_major" == "$dm_major" ] ; then echo " ok" 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 2012-12-17 17:11:40.000000000 +0100 +++ new/mkinitrd-2.7.2/scripts/boot-ibft.sh 2013-03-21 11:16:00.000000000 +0100 @@ -63,4 +63,10 @@ interface=$(ibft_get_ethdev) macaddress=$(ibft_get_att mac) InitiatorName=$(ibft_get_initiatorname) + if [ $nettype = 'dhcp' ] ; then + dhcp_macaddresses="$interface:$macaddress $dhcp_macaddresses" + else + static_macaddresses="$interface:$macaddress $static_macaddresses" + static_ips="$ip $static_ips" + fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.2/scripts/boot-mount.sh new/mkinitrd-2.7.2/scripts/boot-mount.sh --- old/mkinitrd-2.7.2/scripts/boot-mount.sh 2012-12-17 17:11:40.000000000 +0100 +++ new/mkinitrd-2.7.2/scripts/boot-mount.sh 2013-03-21 11:16:00.000000000 +0100 @@ -150,10 +150,9 @@ # "rootflags" command line if [ -n "$rootflags" ] ; then opt="${opt},$rootflags" -else - if [ -n "$rootfsopts" ] ; then - opt="${opt},$rootfsopts" - fi +fi +if [ -n "$rootfsopts" ] ; then + opt="${opt},$rootfsopts" fi [ -n "$rootfstype" ] && opt="${opt} -t $rootfstype" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.2/scripts/boot-network.sh new/mkinitrd-2.7.2/scripts/boot-network.sh --- old/mkinitrd-2.7.2/scripts/boot-network.sh 2012-12-17 17:11:40.000000000 +0100 +++ new/mkinitrd-2.7.2/scripts/boot-network.sh 2013-03-21 11:16:00.000000000 +0100 @@ -148,6 +148,7 @@ i=0 static_ips=($static_ips) static=true +static_interfaces="" for macaddr in $static_macaddresses -- $dhcp_macaddresses; do if test "x$macaddr" = "x--"; then static=false @@ -172,9 +173,15 @@ ip=${ip%:*} tmpip=${ip%:*} ip="${tmpip}:${iface}:${nettype}" + static_interfaces="$iface $static_interfaces" configure_static "$ip" else + # Skip this interface if it was already configured static + case " $static_interfaces " in + *\ $iface\ *) continue;; + *) ;; + esac configure_dynamic "$iface" fi done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.2/scripts/setup-done.sh new/mkinitrd-2.7.2/scripts/setup-done.sh --- old/mkinitrd-2.7.2/scripts/setup-done.sh 2012-12-17 17:11:40.000000000 +0100 +++ new/mkinitrd-2.7.2/scripts/setup-done.sh 2013-03-21 11:16:00.000000000 +0100 @@ -4,7 +4,7 @@ #%depends: progs sharedlibs # -COMPRESS="gzip -9" +COMPRESS="gzip" if [[ $(uname -m) =~ ppc ]] then @@ -20,8 +20,8 @@ oops 8 "Failed to build initrd" fi -arch=$(uname -i) -if [[ $arch =~ arm ]];then +# uImages want to have uInitrds +if [[ $kernel_image =~ uImage ]]; then mkimage -A arm -O linux -T ramdisk -C none -a 0x0 -e 0x0 \ -n 'Initrd' -d $tmp_initrd $tmp_initrd.uboot rm -f $tmp_initrd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.2/scripts/setup-fv_guest.sh new/mkinitrd-2.7.2/scripts/setup-fv_guest.sh --- old/mkinitrd-2.7.2/scripts/setup-fv_guest.sh 2012-12-17 17:11:40.000000000 +0100 +++ new/mkinitrd-2.7.2/scripts/setup-fv_guest.sh 2013-03-21 11:16:00.000000000 +0100 @@ -39,7 +39,7 @@ } if check_hyperv_guest ; then - fv_guest_modules="hv_storvsc hv_netvsc" + fv_guest_modules="hv_storvsc hv_netvsc hyperv_fb" elif check_xen_PVonHVM ; then # Use aliases because the module names differ in xenlinux and pv_ops kernel: # xen:vbd xen-vbd xen-blkfront diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.2/scripts/setup-network.sh new/mkinitrd-2.7.2/scripts/setup-network.sh --- old/mkinitrd-2.7.2/scripts/setup-network.sh 2012-12-17 17:11:40.000000000 +0100 +++ new/mkinitrd-2.7.2/scripts/setup-network.sh 2013-03-21 11:16:00.000000000 +0100 @@ -181,7 +181,7 @@ if test -z "$static_interfaces$dhcp_interfaces"; then ifspec=$(get_default_interface) case "${ifspec##*/}" in - dhcp*) + dhcp*|ibft*) dhcp_interfaces=${ifspec%%/*} ;; *) @@ -198,7 +198,7 @@ eval $(grep BOOTPROTO "$cfg") fi case "$BOOTPROTO" in - dhcp*) + dhcp*|ibft*) dhcp_interfaces="$dhcp_interfaces $iface" ;; *) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.2/src/warpclock.c new/mkinitrd-2.7.2/src/warpclock.c --- old/mkinitrd-2.7.2/src/warpclock.c 2012-12-17 17:11:40.000000000 +0100 +++ new/mkinitrd-2.7.2/src/warpclock.c 2013-03-21 11:16:00.000000000 +0100 @@ -81,7 +81,7 @@ struct timezone zone; time_t now, delta, gmtoff; struct stat st; - int universal = 1; + int universal = 0; int count, adj; err = "warpclock: /etc/localtime"; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
