[packages/rpm-build-macros.git] / disable-systemd.patch

--- rpm-build-macros-1.680/rpm.macros~	2013-11-27 01:15:12.122464636 +0200
+++ rpm-build-macros-1.680/rpm.macros	2013-11-27 01:16:06.644922965 +0200
@@ -716,7 +716,7 @@
 # tmpfiles.d configuration. Warn and terminate build if config is
 # missing.
 #
-#%no_install_post_check_tmpfiles 1
+%no_install_post_check_tmpfiles 1
 #
 %__spec_install_post_check_tmpfiles { \
 __spec_install_post_check_tmpfiles() { \
@@ -2258,79 +2258,17 @@
 # BuildRequires:	rpmbuild(macros) >= 1.671
 # Requires:	systemd-units >= 38
 
-%systemd_reload /bin/systemd_booted && SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog /bin/systemctl --quiet daemon-reload || :
-
-%systemd_service_enable() \
-	export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
-	/bin/systemctl --quiet enable %{*} || : \
-	/bin/systemd_booted && echo 'Run "/bin/systemctl start %{*}" to start %{*}.' || : \
-%{nil}
-
-%systemd_service_disable() \
-	export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
-	/bin/systemctl --quiet disable %{*} || : \
-%{nil}
-
-%systemd_service() \
-	export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
-	/bin/systemd_booted && /bin/systemctl --quiet %{*} || : \
-%{nil}
-
-%systemd_service_start() \
-	export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
-	/bin/systemd_booted && /bin/systemctl --quiet start %{*} || : \
-%{nil}
-
-%systemd_service_stop() \
-	export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
-	/bin/systemd_booted && /bin/systemctl --quiet stop %{*} || : \
-%{nil}
-
-%systemd_service_restart() \
-	export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
-	/bin/systemd_booted && /bin/systemctl --quiet try-restart %{*} || : \
-%{nil}
-
-%systemd_service_reload() \
-	export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
-	/bin/systemd_booted && /bin/systemctl --quiet reload %{*} || : \
-%{nil}
-
-%systemd_trigger() \
-want_enable_service() { \
-	[ -f /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm \
-	[ ${RPM_ENABLE_SYSTEMD_SERVICE:-yes} = no ] && return 1 \
-	[ "$(echo /etc/rc.d/rc[0-6].d/S[0-9][0-9]${1%.service})" = "/etc/rc.d/rc[0-6].d/S[0-9][0-9]${1%.service}" ] && return 1 \
-	return 0 \
-}\
-	export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
-	for s in %{*}; do \
-		if want_enable_service $s; then \
-			/bin/systemctl --quiet enable $s || : \
-		fi \
-	done \
-%{nil}
-
-%systemd_post() \
-	export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
-	/bin/systemd_booted && /bin/systemctl --quiet daemon-reload || : \
-	if [ $1 -eq 1 ]; then \
-		/bin/systemctl --quiet enable %{*} || : \
-		/bin/systemd_booted && echo 'Run "/bin/systemctl start %{*}" to start %{*}.' || : \
-	elif [ -z "$NORESTART" ]; then \
-		/bin/systemd_booted && /bin/systemctl --quiet try-restart %{*} || : \
-	else \
-		/bin/systemd_booted && echo 'Run "/bin/systemctl restart %{*}" to restart %{*}.' || : \
-	fi \
-%{nil}
-
-%systemd_preun() \
-	if [ $1 -eq 0 ]; then \
-		export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
-		/bin/systemd_booted && /bin/systemctl --quiet stop %{*} || : \
-		/bin/systemctl --quiet disable %{*} || : \
-	fi \
-%{nil}
+%systemd_reload %{nil}
+%systemd_service_enable() %{nil}
+%systemd_service_disable() %{nil}
+%systemd_service() %{nil}
+%systemd_service_start() %{nil}
+%systemd_service_stop() %{nil}
+%systemd_service_restart() %{nil}
+%systemd_service_reload() %{nil}
+%systemd_trigger() %{nil}
+%systemd_post() %{nil}
+%systemd_preun() %{nil}
 
 %systemdunitdir /lib/systemd/system
 %systemdtmpfilesdir /usr/lib/tmpfiles.d
--- ./service_generator.sh	1 Feb 2012 17:46:43 -0000	1.13
+++ ./service_generator.sh	4 Jan 2012 05:09:03 -0000	1.11
@@ -19,8 +19,7 @@
 # common part
 service_body() {
 	cat <<-EOF
-		if [ ! -x /bin/systemd_booted ] || ! /bin/systemd_booted; then
-			if [ -f /var/lock/subsys/$service ]; then
+		if [ -f /var/lock/subsys/$service ]; then
 	EOF
 	if [ "$noop" = 1 ]; then
 		echo :
@@ -32,12 +31,11 @@
 
 	if [ "$quiet" != 1 ]; then
 		cat <<-EOF
-			else
-				echo 'Run "/sbin/service $service start" to start $desc.'
+		else
+			echo 'Run "/sbin/service $service start" to start $desc.'
 		EOF
 	fi
 	cat <<-EOF
-			fi
 		fi
 	EOF
 }
@@ -61,10 +59,8 @@
 	echo 'else'
 		# service restart was disabled, tell them to restart it
 	cat <<-EOF
-		if [ ! -x /bin/systemd_booted ] || ! /bin/systemd_booted; then
-			if [ -f /var/lock/subsys/$service ]; then
-				echo 'Run "/sbin/service $service restart" to restart $desc.'
-			fi
+		if [ -f /var/lock/subsys/$service ]; then
+			echo 'Run "/sbin/service $service restart" to restart $desc.'
 		fi
 	EOF
 	echo 'fi'
Commit	Line	Data
2abd4f86 ER	1	--- rpm-build-macros-1.680/rpm.macros~ 2013-11-27 01:15:12.122464636 +0200
2abd4f86 ER	2	+++ rpm-build-macros-1.680/rpm.macros 2013-11-27 01:16:06.644922965 +0200
6b71d42c ER	3	@@ -716,7 +716,7 @@
	4	# tmpfiles.d configuration. Warn and terminate build if config is
	5	# missing.
	6	#
	7	-#%no_install_post_check_tmpfiles 1
	8	+%no_install_post_check_tmpfiles 1
	9	#
	10	%__spec_install_post_check_tmpfiles { \
	11	__spec_install_post_check_tmpfiles() { \
2abd4f86 ER	12	@@ -2258,79 +2258,17 @@
2abd4f86 ER	13	# BuildRequires: rpmbuild(macros) >= 1.671
b0a9798f	14	# Requires: systemd-units >= 38
b0a9798f	15
3db944cb ER	16	-%systemd_reload /bin/systemd_booted && SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog /bin/systemctl --quiet daemon-reload \|\| :
3db944cb ER	17	-
b0a9798f	18	-%systemd_service_enable() \
b0a9798f ER	19	- export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
	20	- /bin/systemctl --quiet enable %{*} \|\| : \
	21	- /bin/systemd_booted && echo 'Run "/bin/systemctl start %{}" to start %{}.' \|\| : \
b0a9798f ER	22	-%{nil}
	23	-
	24	-%systemd_service_disable() \
b0a9798f ER	25	- export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
b0a9798f ER	26	- /bin/systemctl --quiet disable %{*} \|\| : \
b0a9798f ER	27	-%{nil}
	28	-
	29	-%systemd_service() \
b0a9798f ER	30	- export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
b0a9798f ER	31	- /bin/systemd_booted && /bin/systemctl --quiet %{*} \|\| : \
b0a9798f ER	32	-%{nil}
	33	-
	34	-%systemd_service_start() \
b0a9798f ER	35	- export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
b0a9798f ER	36	- /bin/systemd_booted && /bin/systemctl --quiet start %{*} \|\| : \
b0a9798f ER	37	-%{nil}
	38	-
	39	-%systemd_service_stop() \
b0a9798f ER	40	- export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
b0a9798f ER	41	- /bin/systemd_booted && /bin/systemctl --quiet stop %{*} \|\| : \
b0a9798f ER	42	-%{nil}
	43	-
	44	-%systemd_service_restart() \
b0a9798f ER	45	- export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
b0a9798f ER	46	- /bin/systemd_booted && /bin/systemctl --quiet try-restart %{*} \|\| : \
b0a9798f ER	47	-%{nil}
	48	-
	49	-%systemd_service_reload() \
b0a9798f ER	50	- export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
b0a9798f ER	51	- /bin/systemd_booted && /bin/systemctl --quiet reload %{*} \|\| : \
b0a9798f ER	52	-%{nil}
	53	-
	54	-%systemd_trigger() \
b0a9798f ER	55	-want_enable_service() { \
	56	- [ -f /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm \
	57	- [ ${RPM_ENABLE_SYSTEMD_SERVICE:-yes} = no ] && return 1 \
2abd4f86	58	- [ "$(echo /etc/rc.d/rc[0-6].d/S[0-9][0-9]${1%.service})" = "/etc/rc.d/rc[0-6].d/S[0-9][0-9]${1%.service}" ] && return 1 \
b0a9798f ER	59	- return 0 \
	60	-}\
	61	- export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
	62	- for s in %{*}; do \
	63	- if want_enable_service $s; then \
	64	- /bin/systemctl --quiet enable $s \|\| : \
	65	- fi \
	66	- done \
b0a9798f ER	67	-%{nil}
	68	-
	69	-%systemd_post() \
b0a9798f ER	70	- export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
	71	- /bin/systemd_booted && /bin/systemctl --quiet daemon-reload \|\| : \
	72	- if [ $1 -eq 1 ]; then \
	73	- /bin/systemctl --quiet enable %{*} \|\| : \
	74	- /bin/systemd_booted && echo 'Run "/bin/systemctl start %{}" to start %{}.' \|\| : \
	75	- elif [ -z "$NORESTART" ]; then \
	76	- /bin/systemd_booted && /bin/systemctl --quiet try-restart %{*} \|\| : \
	77	- else \
	78	- /bin/systemd_booted && echo 'Run "/bin/systemctl restart %{}" to restart %{}.' \|\| : \
	79	- fi \
b0a9798f ER	80	-%{nil}
	81	-
	82	-%systemd_preun() \
b0a9798f ER	83	- if [ $1 -eq 0 ]; then \
	84	- export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
	85	- /bin/systemd_booted && /bin/systemctl --quiet stop %{*} \|\| : \
	86	- /bin/systemctl --quiet disable %{*} \|\| : \
	87	- fi \
b0a9798f ER	88	-%{nil}
	89	+%systemd_reload %{nil}
	90	+%systemd_service_enable() %{nil}
	91	+%systemd_service_disable() %{nil}
	92	+%systemd_service() %{nil}
	93	+%systemd_service_start() %{nil}
	94	+%systemd_service_stop() %{nil}
	95	+%systemd_service_restart() %{nil}
	96	+%systemd_service_reload() %{nil}
	97	+%systemd_trigger() %{nil}
	98	+%systemd_post() %{nil}
	99	+%systemd_preun() %{nil}
	100
	101	%systemdunitdir /lib/systemd/system
	102	%systemdtmpfilesdir /usr/lib/tmpfiles.d
41a788ea ER	103	--- ./service_generator.sh 1 Feb 2012 17:46:43 -0000 1.13
	104	+++ ./service_generator.sh 4 Jan 2012 05:09:03 -0000 1.11
	105	@@ -19,8 +19,7 @@
	106	# common part
	107	service_body() {
	108	cat <<-EOF
	109	- if [ ! -x /bin/systemd_booted ] \|\| ! /bin/systemd_booted; then
	110	- if [ -f /var/lock/subsys/$service ]; then
	111	+ if [ -f /var/lock/subsys/$service ]; then
	112	EOF
	113	if [ "$noop" = 1 ]; then
	114	echo :
	115	@@ -32,12 +31,11 @@
	116
	117	if [ "$quiet" != 1 ]; then
	118	cat <<-EOF
	119	- else
	120	- echo 'Run "/sbin/service $service start" to start $desc.'
	121	+ else
	122	+ echo 'Run "/sbin/service $service start" to start $desc.'
	123	EOF
	124	fi
	125	cat <<-EOF
	126	- fi
	127	fi
	128	EOF
	129	}
	130	@@ -61,10 +59,8 @@
	131	echo 'else'
	132	# service restart was disabled, tell them to restart it
	133	cat <<-EOF
	134	- if [ ! -x /bin/systemd_booted ] \|\| ! /bin/systemd_booted; then
	135	- if [ -f /var/lock/subsys/$service ]; then
	136	- echo 'Run "/sbin/service $service restart" to restart $desc.'
	137	- fi
	138	+ if [ -f /var/lock/subsys/$service ]; then
	139	+ echo 'Run "/sbin/service $service restart" to restart $desc.'
	140	fi
	141	EOF
	142	echo 'fi'