From 3463fbef0ae90cb2f8a98b353bbbf42cd5d75852 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 2 Oct 2009 17:29:17 +0200
Subject: [PATCH] xbps-base-files: revamp the openrc-service trigger.

It has been modified to support restarting services while upgrading
packages, and simplified as well. Bump to 0.22.

--HG--
extra : convert_revision : 21b5aeaed7b76594c43f2e721c06d4e13d5f5f04
---
 templates/xbps-base-files/template |  2 +-
 triggers/openrc-service            | 61 ++++++++++++++++++++----------
 2 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/templates/xbps-base-files/template b/templates/xbps-base-files/template
index c3f7c792ff..2bbb8dd0ed 100644
--- a/templates/xbps-base-files/template
+++ b/templates/xbps-base-files/template
@@ -1,6 +1,6 @@
 # Template file for 'xbps-base-files'
 pkgname=xbps-base-files
-version=0.21
+version=0.22
 build_style=custom-install
 short_desc="xbps base system files"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/triggers/openrc-service b/triggers/openrc-service
index 6f2e1ffcaf..b99a1baec1 100755
--- a/triggers/openrc-service
+++ b/triggers/openrc-service
@@ -3,13 +3,22 @@
 # Registers or unregisters OpenRC services into the specified
 # runlevel.
 #
-# Arguments:	$1 = action [run/targets]
-#		$2 = target [post-install/pre-remove]
+# Arguments:	$1 = action	[run/targets]
+#		$2 = target	[post-install/pre-remove]
 #		$3 = pkgname
+#		$4 = version
+#		$5 = update	[yes/no]
 #
-initdir=etc/init.d
+ACTION="$1"
+TARGET="$2"
+PKGNAME="$3"
+VERSION="$4"
+UPDATE="$5"
 
-case "$1" in
+initdir=etc/init.d
+metadatadir=var/db/xbps/metadata/${PKGNAME}
+
+case "$ACTION" in
 targets)
 	echo "post-install pre-remove"
 	;;
@@ -18,12 +27,9 @@ run)
 	[ ! -x sbin/rc-service ] && exit 0
 	[ -z "$openrc_services" ] && exit 1
 
-	target=$2
-	if [ "$target" = "pre-remove" ]; then
-		text="Unr"
+	if [ "$TARGET" = "pre-remove" ]; then
 		rcupdate_args="del"
-	elif [ "$target" = "post-install" ]; then
-		text="R"
+	elif [ "$TARGET" = "post-install" ]; then
 		rcupdate_args="add"
 	else
 		exit 1
@@ -33,22 +39,37 @@ run)
 
 	set -- ${openrc_services}
 	while [ $# -gt 0 ]; do
-		if sbin/rc-service -e ${1}; then
-			# Stop the service if it's running.
-			if [ "$target" = "pre-remove" -a -f $initdir/$1 ]; then
-				$initdir/$1 -q status
-				if [ $? -eq 0 ]; then
-					$initdir/$1 stop
+		srv_restart=$metadatadir/.$1_srv_restart
+		if [ "$TARGET" = "post-install" ]; then
+			if [ -f $srv_restart ]; then
+				# Restart service if it was running previously.
+				$initdir/$1 start
+				rm -f $srv_restart
+			else
+				# Register service.
+				if sbin/rc-service -e ${1}; then
+					sbin/rc-update add ${1} ${2}
 				fi
 			fi
-			# (Un)register the service.
-			echo "${text}egistering ${1} OpenRC service..."
-			sbin/rc-update ${rcupdate_args} ${1} ${2}
+		else
+			# While removing always stop the service if running.
+			$initdir/$1 -q status
+			if [ $? -eq 0 ]; then
+				$initdir/$1 stop
+			fi
+			#
+			# While upgrading a package, don't remove the service.
+			#
+			if [ "$UPDATE" = "yes" ]; then
+				touch -f $srv_restart
+			else
+				# Unregister the service.
+				sbin/rc-update del ${1} ${2}
+			fi
 		fi
+		unset srv_restart
 		shift; shift;
 	done
-	sbin/rc-update -u
-
 	;;
 *)
 	exit 1