diff --git a/multipath-tools.changes b/multipath-tools.changes index 22a2001..733cab7 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Sep 2 16:51:23 UTC 2014 - trenn@suse.de + +- Do not call mkinitrd in rpm macros directly, make use of + %{?regenerate_initrd_posttrans} and %{?regenerate_initrd_post} + instead to avoid rebuilding of initrd for each package that + needs initrd recreation. Only update initrd once per install/update + if needed + ------------------------------------------------------------------- Fri Aug 29 12:00:49 CEST 2014 - hare@suse.de diff --git a/multipath-tools.spec b/multipath-tools.spec index 7ef7a27..2ae424e 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -121,26 +121,16 @@ fi if dmsetup --target multipath table | grep -q multipath ; then %service_add_post multipathd.service fi -[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup -if [ -e /var/lib/no_initrd_recreation_by_suspend ]; then - echo "Skipping recreation of existing initial ramdisks, due" - echo "to presence of /var/lib/no_initrd_recreation_by_suspend" -elif [ -x /sbin/mkinitrd ]; then - /sbin/mkinitrd -fi +%{?regenerate_initrd_post} exit 0 +%posttrans +%{?regenerate_initrd_posttrans} + %preun %service_del_preun multipathd.service %postun -[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup -if [ -e /var/lib/no_initrd_recreation_by_suspend ]; then - echo "Skipping recreation of existing initial ramdisks, due" - echo "to presence of /var/lib/no_initrd_recreation_by_suspend" -elif [ -x /sbin/mkinitrd ]; then - /sbin/mkinitrd -fi %service_del_postun multipathd.service %{run_ldconfig}