Attachment 4832 Details for Bug 24989 – proposed patch

[patch] proposed patch

service-systemd.diff (text/plain), 970 bytes, created by Dmitry V. Levin on 2011-03-06 02:12:02 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry V. Levin

Created: 2011-03-06 02:12:02 MSK

Size: 970 bytes

patch

obsolete

>diff --git a/service/service b/service/service
>index 2e5b421..577fae9 100644
>--- a/service/service
>+++ b/service/service
>@@ -8,7 +8,10 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
> export PATH
> 
> VERSION="service version 0.91-alt"
>-SERVICEDIR="/etc/init.d"
>+SERVICEDIR=/etc/init.d
>+SYSTEMCTL=/bin/systemctl
>+SYSTEMD_SERVICE_DIR=/lib/systemd/system
>+SYSTEMD_CGROUP_DIR=/sys/fs/cgroup/systemd
> SERVICE=
> OPTIONS=
> 
>@@ -36,6 +39,9 @@ check_service()
> 		fatal "$SERVICE: Invalid service name"
> 
> 	[ -x "$SERVICEDIR/$SERVICE" ] ||
>+	[ -x "$SYSTEMCTL" -a \
>+	  -d "$SYSTEMD_CGROUP_DIR" -a \
>+	  -f "$SYSTEMD_SERVICE_DIR/$SERVICE.service" ] ||
> 		fatal "$SERVICE: Unrecognized service"
> }
> 
>@@ -69,7 +75,11 @@ case "$1" in
> 		shift
> 		check_service
> 		cd / || exit
>-		"$SERVICEDIR/$SERVICE" "$@"
>-		exit $?
>+		if [ -x "$SYSTEMCTL" -a -d "$SYSTEMD_CGROUP_DIR" ]; then
>+			exec "$SYSTEMCTL" "$@" "$SERVICE.service"
>+		else
>+			exec "$SERVICEDIR/$SERVICE" "$@"
>+		fi
>+		exit
> 		;;
> esac

Actions: View | Diff

Attachments on bug 24989: 4781 | 4830 | 4832 | 4836