X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=service_generator.sh;h=7fa360b9120937a9bdc21764855b6bcc5a4f5bc8;hb=701db5014d9784e58388395a5abb6e798eb18228;hp=7b9beb6302d328bb2d1fde73ff78ba84cee0967e;hpb=2f602dedabf84350fc9a00736af30213acf052a0;p=packages%2Frpm-build-macros.git

diff --git a/service_generator.sh b/service_generator.sh
old mode 100644
new mode 100755
index 7b9beb6..7fa360b
--- a/service_generator.sh
+++ b/service_generator.sh
@@ -4,6 +4,7 @@ service="$1"
 action="$2"
 desc="$3"
 quiet=$quiet
+noop=$noop
 if [ -z "$desc" ]; then
 	desc="$1 service"
 fi
@@ -18,17 +19,25 @@ fi
 # common part
 service_body() {
 	cat <<-EOF
-		if [ -f /var/lock/subsys/$service ]; then
-			/sbin/service $service $action 1>&2 || :;
+		if [ ! -x /bin/systemd_booted ] || ! /bin/systemd_booted; then
+			if [ -f /var/lock/subsys/$service ]; then
 	EOF
+	if [ "$noop" = 1 ]; then
+		echo :
+	else
+		cat <<-EOF
+				/sbin/service $service $action 1>&2 || :;
+		EOF
+	fi
 
 	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
 }
@@ -49,6 +58,16 @@ if [ "$check" = 1 ]; then
 	skip_auto_restart_body
 	echo 'if [ $(skip_auto_restart) = no ]; then'
 		service_body
+	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
+		else	NORESTART=1	# for %systemd_post if called after
+		fi
+	EOF
 	echo 'fi'
 else
 	service_body
@@ -69,4 +88,5 @@ rpm -E '%service monit reload "Monit Daemon"' | sh
 rpm -E '%service monit reload -q "Monit Daemon"' | sh
 rpm -E '%{service monit reload "Monit Daemon"} date' | sh
 rpm -E '%{service monit reload "Monit Daemon" -q} date' | sh
+rpm -E '%{service -n monit restart "Monit Daemon" } date' | sh