Add systemd support ( mdv )

1 files changed, 64 insertions, 17 deletions

diff --git a/add-service b/add-service
index 39c6607..a267439 100755
--- a/add-service
+++ b/add-service
@@ -3,31 +3,52 @@
 # Project         : Mandriva Linux
 # Module          : rpm-helper
 # File            : add-service
-# Version         : $Id: add-service 265147 2010-01-23 18:03:02Z guillomovitch $
-# Author          : Frederic Lepied
+# Version         : $Id: add-service 272144 2011-03-20 18:42:29Z bor $
+# Authors         : Frederic Lepied, Andrey Borzenkov
 # Created On      : Mon Jul  8 08:14:34 2002
 # Purpose         : helper script for rpm scriptlets to add a
 #		    service.
 #---------------------------------------------------------------
 
-if [ $# != 3 ]; then
-    echo "usage: $0 <pkg name> <number installed> <service name>" 1>&2
+if [ x$1 = x--no-sysv ]; then
+    do_sysv=no
+    shift
+else
+    do_sysv=yes
+fi
+
+if [ $# -lt 3 ]; then
+    echo "usage: $0 [--no-sysv] <pkg name> <number installed> [<service name>] <unit name> ..." 1>&2
     exit 1
 fi
 
 pkg=$1				# name of the package
 num=$2				# number of packages installed
-srv=$3				# name of the service
+if [ $do_sysv = yes ]; then
+    srv=$3			# name of the SysV script
+    shift 3
+else
+    srv=
+    shift 2
+fi
+units="$*"			# systemd units
+units_to_enable=		# units enabled by msec
 
 add_chkconfig_service() {
-    srv=$1
-
-    /sbin/chkconfig --add $srv
+    if [ -n "$units_to_enable" ]; then
+	/bin/systemctl --quiet enable $units_to_enable
+    fi
+    if [ -n "$srv" ]; then
+	/sbin/chkconfig --add $srv
+    else
+	exit 0
+    fi
 
     if [ -r /etc/sysconfig/system ]; then
 	. /etc/sysconfig/system
     fi
 
+    # TODO what to do with system units here?
     if [ -z "$ADD_SERVICES_TO_CURRENT_PROFILE_ONLY" ]; then
 	# add the service to all the profiles at once
 	if [ -d /etc/netprofile/profiles/default/services ]; then
@@ -53,24 +74,48 @@ add_service() {
 	LIST=/etc/security/msec/server.$SECURE_LEVEL
     fi
 
+    # This is half-hearted support for msec: we check "srv" for a unit
+    # with name "srv.service". This should account for most(?) common
+    # case when SysV script srv is replaced by single unit srv.service
+    # If SysV name was supplied, we assume units are equivalent and do
+    # not need to be checked.
+    # TODO should msec support full unit name?
     if [ -f $LIST ]; then
-	if grep -q "^${srv}$" $LIST ; then
-	    add_chkconfig_service $srv
+	if [ -n "$srv" ]; then
+	    if fgrep -qx "${srv}" $LIST; then
+		units_to_enable="$units"
+	    else
+		srv=
+	    fi
+	else
+	    for i in $units; do
+		[ $i != ${i%.service} ] && ! fgrep -qx ${i%.service} $LIST && continue
+		units_to_enable="$units_to_enable $i"
+	    done
 	fi
     else
-	# Low security: install all the services
-	add_chkconfig_service $srv
+	units_to_enable="$units"
     fi
+
+    add_chkconfig_service
 }
 
 if [ $num = 1 ]; then
     # First install mode
     add_service
 else
-    # Upgrade mode
+    # Upgrade mode. systemd units are restarted in postun
+    [ -n "$srv" ] || exit 0
 
     # if the service is activated, add it again to be able to handle
-    # changes in start/stop levels
+    # changes in start/stop levels. This does not change enabled/disabled
+    # state, so we do not do it for systemd where dependencies are handled
+    # automatically.
+
+    # Restart only SysV services here only if no additional systemd
+    # units are defined or systemd is not active. Otherwise user is expected
+    # to add postun script that handles systemd units.
+
     set -- /etc/rc3.d/S??$srv
     if [ $# -gt 1 ]; then
 	echo 1>&2 "add-service: Error: $srv appears multiple times: $*"
@@ -80,9 +125,11 @@ else
 	/sbin/chkconfig --add $srv
     fi
 
-    # restart the service if already running
-    if [ -f /var/lock/subsys/$srv ]; then
-	/sbin/service $srv restart > /dev/null || :
+    if [ -z "$units" ] || ! /bin/mountpoint -q /sys/fs/cgroup/systemd; then
+	# restart the service if already running
+	if [ -f /var/lock/subsys/$srv ]; then
+	    /sbin/service $srv restart > /dev/null || :
+	fi
     fi
 fi