Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at 2012-01-05 13:51:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old) and /work/SRC/openSUSE:Factory/.mkinitrd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mkinitrd", Maintainer is "mma...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes 2011-12-12 17:03:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes 2012-01-05 13:51:34.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Jan 3 14:24:46 UTC 2012 - mma...@suse.cz + +- Fix ibft for virtio devices (bnc#735058). + +------------------------------------------------------------------- +Tue Jan 3 14:20:54 UTC 2012 - mma...@suse.cz + +- boot-ibft: Do not hardcode eth* device names (bnc#728631, + bnc#735058#c1). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.qFxJaF/_old 2012-01-05 13:51:35.000000000 +0100 +++ /var/tmp/diff_new_pack.qFxJaF/_new 2012-01-05 13:51:35.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mkinitrd # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 ++++++ mkinitrd.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes new/mkinitrd-2.7.0/mkinitrd.changes --- old/mkinitrd-2.7.0/mkinitrd.changes 2011-12-07 22:16:36.000000000 +0100 +++ new/mkinitrd-2.7.0/mkinitrd.changes 2012-01-03 15:38:31.000000000 +0100 @@ -1,4 +1,21 @@ ------------------------------------------------------------------- +Tue Jan 3 14:24:46 UTC 2012 - mma...@suse.cz + +- Fix ibft for virtio devices (bnc#735058). + +------------------------------------------------------------------- +Tue Jan 3 14:20:54 UTC 2012 - mma...@suse.cz + +- boot-ibft: Do not hardcode eth* device names (bnc#728631, + bnc#735058#c1). + +------------------------------------------------------------------- +Thu Dec 8 10:56:45 UTC 2011 - cfarr...@suse.com + +- license update: GPL-2.0+ + Use SPDX format (http://www.spdx.org/licenses) + +------------------------------------------------------------------- Wed Dec 7 21:14:12 UTC 2011 - mma...@suse.cz - setup-network: Remember the interface name as a fallback if the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.spec new/mkinitrd-2.7.0/mkinitrd.spec --- old/mkinitrd-2.7.0/mkinitrd.spec 2011-12-07 22:16:36.000000000 +0100 +++ new/mkinitrd-2.7.0/mkinitrd.spec 2012-01-03 15:38:31.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package mkinitrd (Version 2.5.10) +# spec file for package mkinitrd # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: mkinitrd -License: GPLv2+ +License: GPL-2.0+ Group: System/Base #!BuildIgnore: module-init-tools e2fsprogs udev reiserfs fop BuildRequires: asciidoc libxslt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/boot-ibft.sh new/mkinitrd-2.7.0/scripts/boot-ibft.sh --- old/mkinitrd-2.7.0/scripts/boot-ibft.sh 2011-12-07 22:16:36.000000000 +0100 +++ new/mkinitrd-2.7.0/scripts/boot-ibft.sh 2012-01-03 15:38:31.000000000 +0100 @@ -20,7 +20,21 @@ } ibft_get_ethdev() { - (cd $ibft_nic/device/net; ls -d eth* 2>/dev/null) + local iface + + if test -d "$ibft_nic/device/net" ; then + for iface in $ibft_nic/device/net/*/addr_len; do + break + done + else + for iface in $ibft_nic/device/*/*/addr_len; do + break + done + fi + iface=${iface%/*} + iface=${iface##*/} + + echo "$iface" } ibft_get_initiatorname() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-ibft.sh new/mkinitrd-2.7.0/scripts/setup-ibft.sh --- old/mkinitrd-2.7.0/scripts/setup-ibft.sh 2011-12-07 22:16:36.000000000 +0100 +++ new/mkinitrd-2.7.0/scripts/setup-ibft.sh 2012-01-03 15:38:31.000000000 +0100 @@ -6,9 +6,15 @@ ibft_set_iface() { local iface - for iface in $ibft_nic/device/net/*/addr_len; do + if test -d "$ibft_nic/device/net" ; then + for iface in $ibft_nic/device/net/*/addr_len; do break - done + done + else + for iface in $ibft_nic/device/*/*/addr_len; do + break + done + fi iface=${iface%/*} iface=${iface##*/} if test -n "$iface"; then -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
