Hello community, here is the log from the commit of package suspend checked in at Mon Sep 8 17:04:16 CEST 2008. -------- --- arch/i386/suspend/suspend.changes 2008-07-23 16:37:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/suspend/suspend.changes 2008-09-08 16:49:42.083533000 +0200 @@ -1,0 +2,5 @@ +Wed Sep 3 11:16:09 CEST 2008 - hare@suse.de + +- Call mkinitrd_setup during %post and %postun (bnc#413709) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suspend.spec ++++++ --- /var/tmp/diff_new_pack.L10705/_old 2008-09-08 17:03:59.000000000 +0200 +++ /var/tmp/diff_new_pack.L10705/_new 2008-09-08 17:03:59.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package suspend (Version 0.80.MACRO) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -112,15 +119,22 @@ %install make install DESTDIR=$RPM_BUILD_ROOT +%if 0%{?suse_version} > 1100 install -d $RPM_BUILD_ROOT/lib/mkinitrd/scripts install -m 755 %{S:4} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-resume.kernel.sh install -m 755 %{S:5} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-resume.userspace.sh +%endif touch $RPM_BUILD_ROOT/etc/suspend.key %clean rm -rf $RPM_BUILD_ROOT %post +%if 0%{?suse_version} > 1100 +if [ -x /sbin/mkinitrd_setup ] ; then + mkinitrd_setup +fi +%endif if [ "$YAST_IS_RUNNING" != "instsys" -a \ ! -e /.buildenv -a \ -x /sbin/update-bootloader -a \ @@ -128,14 +142,23 @@ /sbin/mkinitrd /sbin/update-bootloader --refresh fi +%if 0%{?suse_version} > 1100 + +%postun +if [ -x /sbin/mkinitrd_setup ] ; then + mkinitrd_setup +fi +%endif %files %defattr (-,root,root) %config /etc/suspend.conf +%if 0%{?suse_version} > 1100 %dir /lib/mkinitrd %dir /lib/mkinitrd/scripts /lib/mkinitrd/scripts/boot-resume.kernel.sh /lib/mkinitrd/scripts/boot-resume.userspace.sh +%endif %ghost %config(noreplace) /etc/suspend.key /usr/sbin/s2disk /usr/sbin/s2ram @@ -149,6 +172,8 @@ %endif %changelog +* Wed Sep 03 2008 hare@suse.de +- Call mkinitrd_setup during %%post and %%postun (bnc#413709) * Wed Jul 23 2008 hare@suse.de - Include mkinitrd scriptlets. * Tue Jun 24 2008 seife@suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org