Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at 2012-07-19 17:58:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2012-07-04 22:21:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes 2012-07-19 17:58:35.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jul 18 14:23:18 UTC 2012 - [email protected] + +- Add xhci-hcd to the initrd (bnc#755113). + +------------------------------------------------------------------- @@ -22,0 +28,11 @@ + +------------------------------------------------------------------- +Fri May 11 11:04:06 UTC 2012 - [email protected] + +- setup-network.sh: Fix handling of bridge interfaces (bnc#759623) + +------------------------------------------------------------------- +Fri May 4 13:57:48 UTC 2012 - [email protected] + +- Recreate the initrd for all installed kernels after updating + the mkinitrd package (bnc#755924). Old: ---- mkinitrd-2.7.0-adjtime.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.p8bnU3/_old 2012-07-19 17:58:40.000000000 +0200 +++ /var/tmp/diff_new_pack.p8bnU3/_new 2012-07-19 17:58:40.000000000 +0200 @@ -47,7 +47,6 @@ Group: System/Base BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mkinitrd.tar.bz2 -Patch0: mkinitrd-2.7.0-adjtime.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 @@ -82,7 +81,6 @@ %prep %setup -%patch0 -p1 %build %__cc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c @@ -136,6 +134,7 @@ %posttrans /sbin/mkinitrd_setup +/sbin/mkinitrd %files %defattr(-,root,root) ++++++ 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 2012-06-13 15:58:10.000000000 +0200 +++ new/mkinitrd-2.7.0/mkinitrd.changes 2012-07-18 16:26:28.000000000 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Wed Jul 18 14:23:18 UTC 2012 - [email protected] + +- Add xhci-hcd to the initrd (bnc#755113). + +------------------------------------------------------------------- +Wed Jul 4 14:43:05 UTC 2012 - [email protected] + +- Fix boot clock scriptlet by testing /etc/adjtime before + /etc/sysconfig/clock to make sure that warpclock is executed + if CMOS clock is in local time + +------------------------------------------------------------------- Tue Jun 12 15:28:45 UTC 2012 - [email protected] - mount /usr without chrooting into root fs first, /usr carries @@ -15,6 +27,17 @@ - Make warpclock working with upstream systemd HW clock management ------------------------------------------------------------------- +Fri May 11 11:04:06 UTC 2012 - [email protected] + +- setup-network.sh: Fix handling of bridge interfaces (bnc#759623) + +------------------------------------------------------------------- +Fri May 4 13:57:48 UTC 2012 - [email protected] + +- Recreate the initrd for all installed kernels after updating + the mkinitrd package (bnc#755924). + +------------------------------------------------------------------- Thu May 3 11:59:35 UTC 2012 - [email protected] - Avoid accidental tilde expansion when parsing parameters 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 2012-06-13 15:58:10.000000000 +0200 +++ new/mkinitrd-2.7.0/mkinitrd.spec 2012-07-18 16:26:28.000000000 +0200 @@ -126,6 +126,7 @@ %posttrans /sbin/mkinitrd_setup +/sbin/mkinitrd %files %defattr(-,root,root) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/boot-clock.sh new/mkinitrd-2.7.0/scripts/boot-clock.sh --- old/mkinitrd-2.7.0/scripts/boot-clock.sh 2012-06-13 15:58:10.000000000 +0200 +++ new/mkinitrd-2.7.0/scripts/boot-clock.sh 2012-07-18 16:26:28.000000000 +0200 @@ -5,21 +5,23 @@ #%provides: clock #%dontshow -if test -e /etc/sysconfig/clock -a -e /etc/localtime +if test -e /etc/localtime then - . /etc/sysconfig/clock - case "$HWCLOCK" in - *-l*) /bin/warpclock - > /dev/shm/warpclock - esac -elif test -e /etc/adjtime -a -e /etc/localtime -then - while read line - do - if test "$line" = LOCAL - then - /bin/warpclock - > /dev/shm/warpclock - fi - done < /etc/adjtime + if test -e /etc/adjtime + then + while read line + do if test "$line" = LOCAL + then + /bin/warpclock + > /dev/shm/warpclock + fi + done < /etc/adjtime + elif test -e /etc/sysconfig/clock + then + . /etc/sysconfig/clock + case "$HWCLOCK" in + *-l*) /bin/warpclock + > /dev/shm/warpclock + esac + fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/boot-usb.sh new/mkinitrd-2.7.0/scripts/boot-usb.sh --- old/mkinitrd-2.7.0/scripts/boot-usb.sh 2012-06-13 15:58:10.000000000 +0200 +++ new/mkinitrd-2.7.0/scripts/boot-usb.sh 2012-07-18 16:26:28.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash #%stage: device -#%udevmodules: usbcore ohci_hcd uhci-hcd ehci_hcd usbhid hid-logitech-dj +#%udevmodules: usbcore ohci_hcd uhci-hcd ehci_hcd xhci-hcd usbhid hid-logitech-dj #%if: "$use_usb" # ##### usb module helper diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-network.sh new/mkinitrd-2.7.0/scripts/setup-network.sh --- old/mkinitrd-2.7.0/scripts/setup-network.sh 2012-06-13 15:58:10.000000000 +0200 +++ new/mkinitrd-2.7.0/scripts/setup-network.sh 2012-07-18 16:26:28.000000000 +0200 @@ -113,25 +113,26 @@ fi # if the interface is a bridge, then try to use the underlying interface - # if the contains only one network device (as usual when giving virtual - # machines network access) + # if it is the only non-virtual interface (not tap or vif) if [ -d "/sys/class/net/$ifname/bridge" -a \ -d "/sys/class/net/$ifname/brif" ] ; then - ports=$(ls "/sys/class/net/$ifname/brif") - - # count the number of ports without using 'wc' - count=0 - for port in $ports ; do + local ifname2 res count=0 + for ifname2 in "/sys/class/net/$ifname/brif"/*; do + case "$(readlink -f "$ifname2")" in + /sys/devices/virtual/*) + continue + esac + res=${ifname2##*/} count=$[count+1] done if [ "$count" -ne 1 ] ; then - echo >&2 "WARNING: $port is a bridge with more than one interfaces" + echo >&2 "WARNING: $ifname is a bridge with more than one interfaces" echo >&2 " behind the bridge. Please call mkinitrd with a" echo >&2 " device name manually (-D or -I)." else - ifname="$ports" + ifname="$res" fi fi -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
