Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at 2012-07-30 09:26:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2012-07-19 17:58:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes 2012-07-30 09:26:10.000000000 +0200 @@ -1,0 +2,22 @@ +Thu Jul 26 07:47:57 UTC 2012 - mma...@suse.cz + +- Add purge-kernels.service to the filelist. + +------------------------------------------------------------------- +Wed Jul 25 20:08:03 UTC 2012 - mvysko...@suse.cz + +- Add purge-kernels.service + +------------------------------------------------------------------- +Thu Jul 19 11:58:40 UTC 2012 - mma...@suse.cz + +- Do not copy firmware files of all kernel packages installed + (bnc#769627). + +------------------------------------------------------------------- +Thu Jul 19 09:08:26 UTC 2012 - dmzh...@suse.com + +- boot-devfunctions.sh: Call vgchange with --partial --sysinit + (bnc#731317). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.SdNe5P/_old 2012-07-30 09:26:12.000000000 +0200 +++ /var/tmp/diff_new_pack.SdNe5P/_new 2012-07-30 09:26:12.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 @@ -124,13 +128,34 @@ 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 @@ -149,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-07-18 16:26:28.000000000 +0200 +++ new/mkinitrd-2.7.0/mkinitrd.changes 2012-07-26 09:48:26.000000000 +0200 @@ -1,4 +1,26 @@ ------------------------------------------------------------------- +Thu Jul 26 07:47:57 UTC 2012 - mma...@suse.cz + +- Add purge-kernels.service to the filelist. + +------------------------------------------------------------------- +Wed Jul 25 20:08:03 UTC 2012 - mvysko...@suse.cz + +- Add purge-kernels.service + +------------------------------------------------------------------- +Thu Jul 19 11:58:40 UTC 2012 - mma...@suse.cz + +- Do not copy firmware files of all kernel packages installed + (bnc#769627). + +------------------------------------------------------------------- +Thu Jul 19 09:08:26 UTC 2012 - dmzh...@suse.com + +- boot-devfunctions.sh: Call vgchange with --partial --sysinit + (bnc#731317). + +------------------------------------------------------------------- Wed Jul 18 14:23:18 UTC 2012 - mma...@suse.cz - Add xhci-hcd to the initrd (bnc#755113). 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-07-18 16:26:28.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,13 +120,34 @@ 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 @@ -141,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-devfunctions.sh new/mkinitrd-2.7.0/scripts/boot-devfunctions.sh --- old/mkinitrd-2.7.0/scripts/boot-devfunctions.sh 2012-07-18 16:26:28.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/setup-modules.sh new/mkinitrd-2.7.0/scripts/setup-modules.sh --- old/mkinitrd-2.7.0/scripts/setup-modules.sh 2012-07-18 16:26:28.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" -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org