Re-indent init-functions script.

diff --git a/debian/changelog b/debian/changelog
index ba9a4d82307a4e1bbca5f0b4477140ddd2a88c90..ceea6157aad1df5cb1ebb829255579d383449fa9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
 

diff --git a/debian/init-functions b/debian/init-functions
index 81e4bd7b8c2f799c951be9a3d928a656adeb31c0..00d9dcafe227519812bf5d0078491eef03490b7e 100644 (file)
--- a/debian/init-functions
+++ b/debian/init-functions
@@ -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