packages: rpm-build-macros/service_generator.sh - /bin/systemd_booted may n...

[baggins]

Author: baggins                      Date: Wed Feb  1 17:46:48 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- /bin/systemd_booted may not exist

---- Files affected:
packages/rpm-build-macros:
   service_generator.sh (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/service_generator.sh
diff -u packages/rpm-build-macros/service_generator.sh:1.12 packages/rpm-build-macros/service_generator.sh:1.13
--- packages/rpm-build-macros/service_generator.sh:1.12	Wed Feb  1 13:26:56 2012
+++ packages/rpm-build-macros/service_generator.sh	Wed Feb  1 18:46:43 2012
@@ -19,7 +19,7 @@
 # common part
 service_body() {
 	cat <<-EOF
-		if ! /bin/systemd_booted; then
+		if [ ! -x /bin/systemd_booted ] || ! /bin/systemd_booted; then
 			if [ -f /var/lock/subsys/$service ]; then
 	EOF
 	if [ "$noop" = 1 ]; then
@@ -61,7 +61,7 @@
 	echo 'else'
 		# service restart was disabled, tell them to restart it
 	cat <<-EOF
-		if ! /bin/systemd_booted; then
+		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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/service_generator.sh?r1=1.12&r2=1.13&f=u