Stephan Kulow 2014-09-09 16:59:44 +00:00 committed by Git OBS Bridge
commit 6e1800639e
2 changed files with 13 additions and 14 deletions

View File

@ -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 Fri Aug 29 12:00:49 CEST 2014 - hare@suse.de

View File

@ -121,26 +121,16 @@ fi
if dmsetup --target multipath table | grep -q multipath ; then if dmsetup --target multipath table | grep -q multipath ; then
%service_add_post multipathd.service %service_add_post multipathd.service
fi fi
[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup %{?regenerate_initrd_post}
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
exit 0 exit 0
%posttrans
%{?regenerate_initrd_posttrans}
%preun %preun
%service_del_preun multipathd.service %service_del_preun multipathd.service
%postun %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 %service_del_postun multipathd.service
%{run_ldconfig} %{run_ldconfig}