Commit 7d6d6e39 authored by Michael Biebl's avatar Michael Biebl Committed by Tollef Fog Heen
Browse files

Re-indent init-functions script.

parent afbc324d
......@@ -14,6 +14,7 @@ systemd (40-1) unstable; urgency=low
* Update symbols file for libsystemd-login.
* Update configure flags, use rootprefix instead of rootdir.
* Copy intltool files instead of symlinking them.
* Re-indent init-functions script.
-- Tollef Fog Heen <tfheen@debian.org> Tue, 07 Feb 2012 21:36:34 +0100
......
......@@ -3,97 +3,97 @@
. /lib/lsb/init-functions.systemd
if [ -e /sys/fs/cgroup/systemd ] ; then
if [ -e /sys/fs/cgroup/systemd ]; then
# Some init scripts use "set -e" and "set -u", we don't want that
# here
set +e
set +u
if [ -n "$DPKG_MAINTSCRIPT_PACKAGE" ] ; then
if [ -n "$DPKG_MAINTSCRIPT_PACKAGE" ]; then
# If we are called by a maintainer script, chances are good that a
# new or updated sysv init script was installed. Reload daemon to
# pick up any changes.
echo "Reloading systemd"
systemctl daemon-reload
echo "Reloading systemd"
systemctl daemon-reload
fi
# Redirect SysV init scripts when executed by the user
if [ $PPID -ne 1 ] && [ -z "$init" ] && [ -z "$_SYSTEMCTL_SKIP_REDIRECT" ] ; then
if [ $PPID -ne 1 ] && [ -z "$init" ] && [ -z "$_SYSTEMCTL_SKIP_REDIRECT" ]; then
case $(readlink -f "$0") in
/etc/init.d/*)
# Don't redirect if the init script has X-Interactive: true
if ! grep -qs "^# X-Interactive:.*true" "$0"; then
_use_systemctl=1
fi
# Redirect if there's a matching .service file in /etc or /lib
prog=${0##*/}
service="${prog%.sh}.service"
fp=$(systemctl -p FragmentPath show $service 2>/dev/null | sed 's/^FragmentPath=//')
case "$fp" in
/lib/systemd/system/*|/etc/systemd/system/*)
_use_systemctl=1
;;
esac
# Don't redirect if the init script has X-Interactive: true
if ! grep -qs "^# X-Interactive:.*true" "$0"; then
_use_systemctl=1
fi
# Redirect if there's a matching .service file in /etc or /lib
prog=${0##*/}
service="${prog%.sh}.service"
fp=$(systemctl -p FragmentPath show $service 2>/dev/null | sed 's/^FragmentPath=//')
case "$fp" in
/lib/systemd/system/*|/etc/systemd/system/*)
_use_systemctl=1
;;
esac
# Some services can't reload through the .service file,
# but can through the init script.
if [ "$(systemctl -p CanReload show $service 2>/dev/null)" = "CanReload=no" ] && [ "$1" = "reload" ]; then
_use_systemctl=0
fi
;;
esac
if [ "$(systemctl -p CanReload show $service 2>/dev/null)" = "CanReload=no" ] && [ "$1" = "reload" ]; then
_use_systemctl=0
fi
;;
esac
else
export _SYSTEMCTL_SKIP_REDIRECT="true"
export _SYSTEMCTL_SKIP_REDIRECT="true"
fi
else
_use_systemctl=0
fi
systemctl_redirect () {
local s
local rc
local prog=${1##*/}
local command=$2
local s
local rc
local prog=${1##*/}
local command=$2
case "$command" in
start)
s="Starting $prog (via systemctl)"
;;
stop)
s="Stopping $prog (via systemctl)"
;;
reload|force-reload)
s="Reloading $prog configuration (via systemctl)"
;;
restart)
s="Restarting $prog (via systemctl)"
;;
esac
case "$command" in
start)
s="Starting $prog (via systemctl)"
;;
stop)
s="Stopping $prog (via systemctl)"
;;
reload|force-reload)
s="Reloading $prog configuration (via systemctl)"
;;
restart)
s="Restarting $prog (via systemctl)"
;;
esac
service="${prog%.sh}.service"
service="${prog%.sh}.service"
# Don't try to run masked services. Don't check for errors, if
# this errors, we'll just call systemctl and possibly explode
# there.
state=$(systemctl -p LoadState show $service 2>/dev/null)
[ "$state" = "LoadState=masked" ] && return 0
# Don't try to run masked services. Don't check for errors, if
# this errors, we'll just call systemctl and possibly explode
# there.
state=$(systemctl -p LoadState show $service 2>/dev/null)
[ "$state" = "LoadState=masked" ] && return 0
[ "$command" = status ] || log_daemon_msg "$s" "$service"
/bin/systemctl $command "$service"
rc=$?
[ "$command" = status ] || log_end_msg $rc
[ "$command" = status ] || log_daemon_msg "$s" "$service"
/bin/systemctl $command "$service"
rc=$?
[ "$command" = status ] || log_end_msg $rc
return $rc
return $rc
}
if [ "$_use_systemctl" = "1" ]; then
if [ "x$1" = xstart -o \
"x$1" = xstop -o \
"x$1" = xrestart -o \
"x$1" = xreload -o \
"x$1" = xforce-reload -o \
"x$1" = xstatus ] ; then
if [ "x$1" = xstart -o \
"x$1" = xstop -o \
"x$1" = xrestart -o \
"x$1" = xreload -o \
"x$1" = xforce-reload -o \
"x$1" = xstatus ] ; then
systemctl_redirect $0 $1
exit $?
fi
systemctl_redirect $0 $1
exit $?
fi
fi
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment