packages: rpm-build-macros/rpm-build-macros.spec, rpm-build-macros/rpm.macr...

[wiget]

Author: wiget                        Date: Sun Dec  4 13:26:31 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use systemd_booted to check if system is booted using systemd
- redirect message from systemctl to syslog

---- Files affected:
packages/rpm-build-macros:
   rpm-build-macros.spec (1.304 -> 1.305) , rpm.macros (1.624 -> 1.625) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm-build-macros.spec
diff -u packages/rpm-build-macros/rpm-build-macros.spec:1.304 packages/rpm-build-macros/rpm-build-macros.spec:1.305
--- packages/rpm-build-macros/rpm-build-macros.spec:1.304	Sun Dec  4 12:36:10 2011
+++ packages/rpm-build-macros/rpm-build-macros.spec	Sun Dec  4 14:26:25 2011
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-%define		rpm_macros_rev	1.624
+%define		rpm_macros_rev	1.625
 %define		find_lang_rev	1.35
 Summary:	PLD Linux RPM build macros
 Summary(pl.UTF-8):	Makra do budowania pakietów RPM dla Linuksa PLD
@@ -92,6 +92,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.305  2011/12/04 13:26:25  wiget
+- use systemd_booted to check if system is booted using systemd
+- redirect message from systemctl to syslog
+
 Revision 1.304  2011/12/04 11:36:10  arekm
 - more conservative kernel modules stripping
 

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.624 packages/rpm-build-macros/rpm.macros:1.625
--- packages/rpm-build-macros/rpm.macros:1.624	Sun Dec  4 12:36:10 2011
+++ packages/rpm-build-macros/rpm.macros	Sun Dec  4 14:26:25 2011
@@ -2065,29 +2065,37 @@
 # %systemd_postun %{name}
 #
 # Requirements:
-# BuildRequires: rpmbuild(macros) >= 1.622
-# Requires:	 rc-scripts >= ...
+# BuildRequires: rpmbuild(macros) >= 1.625
+# Requires:	 systemd-units >= 37-0.10
 
 %systemd_enable() \
+	export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog; \
 	if [ $1 -eq 1 ]; then  \
-		/bin/systemctl enable %1 >/dev/null 2>&1 || : \
+		/bin/systemctl --quiet enable %1 || : \
 	fi
 
 %systemd_post() \
-	if [ $1 -eq 1 ]; then \
-		/bin/systemctl daemon-reload >/dev/null 2>&1 || : \
+	export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog; \
+	if [ $1 -eq 1 ] && /bin/systemd_booted; then \
+		/bin/systemctl --quiet daemon-reload || : \
 	fi
 
 %systemd_preun() \
+	export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog; \
 	if [ $1 -eq 0 ]; then \
-		/bin/systemctl --no-reload disable %1 > /dev/null 2>&1 || : \
-		/bin/systemctl stop %1 > /dev/null 2>&1 || : \
+		/bin/systemctl --no-reload --quiet disable %1 || : \
+		if /bin/systemd_booted; then \
+			/bin/systemctl --quiet stop %1 || : \
+		fi \
 	fi
 
 %systemd_postun() \
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || : \
-    if [ $1 -ge 1 ]; then \
-		/bin/systemctl try-restart %1 >/dev/null 2>&1 || : \
+	export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog; \
+	if /bin/systemd_booted; then \
+		/bin/systemctl --quiet daemon-reload || : \
+		if [ $1 -ge 1 ]; then \
+			/bin/systemctl --quiet try-restart %1 || : \
+		fi \
 	fi
 
 %systemdunitdir /lib/systemd/system
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm-build-macros.spec?r1=1.304&r2=1.305&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.624&r2=1.625&f=u