commit mkinitrd for openSUSE:12.2
Hello community, here is the log from the commit of package mkinitrd for openSUSE:12.2 checked in at 2012-07-30 09:26:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/mkinitrd (Old) and /work/SRC/openSUSE:12.2/.mkinitrd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mkinitrd", Maintainer is "MMarek@suse.com" Changes: -------- --- /work/SRC/openSUSE:12.2/mkinitrd/mkinitrd.changes 2012-07-04 22:21:25.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.mkinitrd.new/mkinitrd.changes 2012-07-30 09:26:15.000000000 +0200 @@ -1,0 +2,27 @@ +Thu Jul 26 07:47:57 UTC 2012 - mmarek@suse.cz + +- Add purge-kernels.service to the filelist. + +------------------------------------------------------------------- +Wed Jul 25 20:08:03 UTC 2012 - mvyskocil@suse.cz + +- Add purge-kernels.service + +------------------------------------------------------------------- +Thu Jul 19 11:58:40 UTC 2012 - mmarek@suse.cz + +- Do not copy firmware files of all kernel packages installed + (bnc#769627). + +------------------------------------------------------------------- +Thu Jul 19 09:08:26 UTC 2012 - dmzhang@suse.com + +- boot-devfunctions.sh: Call vgchange with --partial --sysinit + (bnc#731317). + +------------------------------------------------------------------- +Wed Jul 18 14:23:18 UTC 2012 - mmarek@suse.cz + +- Add xhci-hcd to the initrd (bnc#755113). + +------------------------------------------------------------------- @@ -22,0 +50,11 @@ + +------------------------------------------------------------------- +Fri May 11 11:04:06 UTC 2012 - mmarek@suse.cz + +- setup-network.sh: Fix handling of bridge interfaces (bnc#759623) + +------------------------------------------------------------------- +Fri May 4 13:57:48 UTC 2012 - mmarek@suse.cz + +- 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.j4xFwf/_old 2012-07-30 09:26:15.000000000 +0200 +++ /var/tmp/diff_new_pack.j4xFwf/_new 2012-07-30 09:26:15.000000000 +0200 @@ -20,6 +20,10 @@ #!BuildIgnore: module-init-tools e2fsprogs udev reiserfs fop BuildRequires: asciidoc BuildRequires: libxslt +%if 0%{?suse_version} >= 1210 +BuildRequires: systemd +%{?systemd_requires} +%endif Requires: coreutils Requires: cpio Requires: file @@ -47,7 +51,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 +85,6 @@ %prep %setup -%patch0 -p1 %build %__cc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c @@ -126,16 +128,38 @@ install -m 755 etc/purge-kernels.init $RPM_BUILD_ROOT/etc/init.d/purge-kernels install -m 644 etc/sysconfig.kernel-mkinitrd $RPM_BUILD_ROOT/var/adm/fillup-templates/ +%if 0%{?suse_version} >= 1210 +mkdir -p $RPM_BUILD_ROOT/%{_unitdir}/ +install -m 644 etc/purge-kernels.service $RPM_BUILD_ROOT/%{_unitdir}/ +%endif + +%pre +%if 0%{?suse_version} >= 1210 +%service_add_pre purge-kernels.service +%endif + +%preun +%if 0%{?suse_version} >= 1210 +%service_del_preun purge-kernels.service +%endif + %post %{fillup_only -an kernel} %{insserv_force_if_yast /etc/init.d/boot.loadmodules} %{fillup_and_insserv -f -Y purge-kernels} +%if 0%{?suse_version} >= 1210 +%service_add_post purge-kernels.service +%endif %postun %insserv_cleanup +%if 0%{?suse_version} >= 1210 +%service_del_postun purge-kernels.service +%endif %posttrans /sbin/mkinitrd_setup +/sbin/mkinitrd %files %defattr(-,root,root) @@ -150,6 +174,7 @@ %config /etc/rpm/macros.mkinitrd /etc/init.d/boot.loadmodules /etc/init.d/purge-kernels +%_unitdir/purge-kernels.service /lib/mkinitrd/scripts/*.sh /lib/mkinitrd/bin/* /bin/lsinitrd ++++++ mkinitrd.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/etc/purge-kernels.service new/mkinitrd-2.7.0/etc/purge-kernels.service --- old/mkinitrd-2.7.0/etc/purge-kernels.service 1970-01-01 01:00:00.000000000 +0100 +++ new/mkinitrd-2.7.0/etc/purge-kernels.service 2012-07-26 09:48:26.000000000 +0200 @@ -0,0 +1,12 @@ +[Unit] +Description=Purge old kernels +After=local_fs.target +ConditionPathExists=/boot/do_pure_kernels + +[Service] +Type=oneshot +ExecStartPre=/bin/rm -f /boot/do_pure_kernels +ExecStart=/sbin/purge-kernels + +[Install] +WantedBy=multi-user.target 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-26 09:48:26.000000000 +0200 @@ -1,4 +1,38 @@ ------------------------------------------------------------------- +Thu Jul 26 07:47:57 UTC 2012 - mmarek@suse.cz + +- Add purge-kernels.service to the filelist. + +------------------------------------------------------------------- +Wed Jul 25 20:08:03 UTC 2012 - mvyskocil@suse.cz + +- Add purge-kernels.service + +------------------------------------------------------------------- +Thu Jul 19 11:58:40 UTC 2012 - mmarek@suse.cz + +- Do not copy firmware files of all kernel packages installed + (bnc#769627). + +------------------------------------------------------------------- +Thu Jul 19 09:08:26 UTC 2012 - dmzhang@suse.com + +- boot-devfunctions.sh: Call vgchange with --partial --sysinit + (bnc#731317). + +------------------------------------------------------------------- +Wed Jul 18 14:23:18 UTC 2012 - mmarek@suse.cz + +- Add xhci-hcd to the initrd (bnc#755113). + +------------------------------------------------------------------- +Wed Jul 4 14:43:05 UTC 2012 - werner@suse.de + +- 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 - coolo@suse.com - mount /usr without chrooting into root fs first, /usr carries @@ -15,6 +49,17 @@ - Make warpclock working with upstream systemd HW clock management ------------------------------------------------------------------- +Fri May 11 11:04:06 UTC 2012 - mmarek@suse.cz + +- setup-network.sh: Fix handling of bridge interfaces (bnc#759623) + +------------------------------------------------------------------- +Fri May 4 13:57:48 UTC 2012 - mmarek@suse.cz + +- Recreate the initrd for all installed kernels after updating + the mkinitrd package (bnc#755924). + +------------------------------------------------------------------- Thu May 3 11:59:35 UTC 2012 - mmarek@suse.cz - 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-26 09:48:26.000000000 +0200 @@ -23,6 +23,10 @@ Group: System/Base #!BuildIgnore: module-init-tools e2fsprogs udev reiserfs fop BuildRequires: asciidoc libxslt +%if 0%{?suse_version} >= 1210 +BuildRequires: systemd +%{?systemd_requires} +%endif Requires: coreutils modutils util-linux grep gzip sed cpio udev file perl-Bootloader Requires: xz %if 0%{?suse_version} > 1120 @@ -116,16 +120,38 @@ install -m 755 etc/purge-kernels.init $RPM_BUILD_ROOT/etc/init.d/purge-kernels install -m 644 etc/sysconfig.kernel-mkinitrd $RPM_BUILD_ROOT/var/adm/fillup-templates/ +%if 0%{?suse_version} >= 1210 +mkdir -p $RPM_BUILD_ROOT/%{_unitdir}/ +install -m 644 etc/purge-kernels.service $RPM_BUILD_ROOT/%{_unitdir}/ +%endif + +%pre +%if 0%{?suse_version} >= 1210 +%service_add_pre purge-kernels.service +%endif + +%preun +%if 0%{?suse_version} >= 1210 +%service_del_preun purge-kernels.service +%endif + %post %{fillup_only -an kernel} %{insserv_force_if_yast /etc/init.d/boot.loadmodules} %{fillup_and_insserv -f -Y purge-kernels} +%if 0%{?suse_version} >= 1210 +%service_add_post purge-kernels.service +%endif %postun %insserv_cleanup +%if 0%{?suse_version} >= 1210 +%service_del_postun purge-kernels.service +%endif %posttrans /sbin/mkinitrd_setup +/sbin/mkinitrd %files %defattr(-,root,root) @@ -140,6 +166,7 @@ %config /etc/rpm/macros.mkinitrd /etc/init.d/boot.loadmodules /etc/init.d/purge-kernels +%_unitdir/purge-kernels.service /lib/mkinitrd/scripts/*.sh /lib/mkinitrd/bin/* /bin/lsinitrd 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-26 09:48:26.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-devfunctions.sh new/mkinitrd-2.7.0/scripts/boot-devfunctions.sh --- old/mkinitrd-2.7.0/scripts/boot-devfunctions.sh 2012-06-13 15:58:10.000000000 +0200 +++ new/mkinitrd-2.7.0/scripts/boot-devfunctions.sh 2012-07-26 09:48:26.000000000 +0200 @@ -74,7 +74,7 @@ break; elif [ -x /sbin/multipath ] ; then if [ -n "$vg_root" -a -n "$vg_roots" ] ; then - vgchange -a n + vgchange --sysinit -a n fi echo -n "!" multipath -v0 @@ -97,7 +97,7 @@ vgscan for vgr in $vg_root $vg_roots; do - vgchange -a y $vgr + vgchange -a y --partial --sysinit $vgr done wait_for_events fi @@ -105,12 +105,12 @@ fi if [ -x /sbin/multipath ] && [ -n "$vg_root" -a -n "$vg_roots" ] ; then echo "Resetting LVM for multipath" - vgchange -a n + vgchange --sysinit -a n multipath -v 0 wait_for_events vgscan for vgr in $vg_root $vg_roots; do - vgchange -a y $vgr + vgchange -a y --partial --sysinit $vgr done wait_for_events 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-26 09:48:26.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-modules.sh new/mkinitrd-2.7.0/scripts/setup-modules.sh --- old/mkinitrd-2.7.0/scripts/setup-modules.sh 2012-06-13 15:58:10.000000000 +0200 +++ new/mkinitrd-2.7.0/scripts/setup-modules.sh 2012-07-26 09:48:26.000000000 +0200 @@ -319,6 +319,7 @@ fi # Copy all modules into the initrd +has_firmware=false for module in $resolved_modules; do if [ ! -r $root_dir/$module ]; then oops 9 "Module $module not found." @@ -329,20 +330,26 @@ rm -rf $tmp_mnt return 1 fi - for fwl in $(modinfo -F firmware $module) ; do - bmod=$(basename $module) - bfwl=$(basename $fwl) - - # Using find -L instead of a trailing slash means - # we get /lib/firmware instead of /usr/lib/firmware. - firmwaredir="/usr/lib/firmware/" - [ -e "$firmwaredir" ] || firmwaredir="/lib/firmware/" - for fw in $(find "$firmwaredir" -name "$bfwl") ; do - cp -p --parents $fw $tmp_mnt - echo -n "(module $bmod firmware $fw) " - done + # add any required firmware files + for fw in $(modinfo -F firmware $module) ; do + for dir in {/usr,}/lib/firmware{,/updates}; do + for subdir in "" "$kernel_version"; do + if test -e "$dir/$subdir/$fw"; then + cp -p --parents "$_" "$tmp_mnt" + if ! $has_firmware; then + echo -ne "Firmware:\t" + has_firmware=true + fi + echo -n "$fw " + fi + done + done done done +if $has_firmware; then + echo +fi +unset has_firmware if [ "$resolved_modules" ] ; then [ ! -d $tmp_mnt/lib/modules/$kernel_version ] && oops 10 "No modules have been installed" 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-26 09:48:26.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: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de