Merge remote-tracking branch 'origin/github/pr/104'

[grml-etc-core.git] / etc / grml / lsb-functions

diff --git a/etc/grml/lsb-functions b/etc/grml/lsb-functions
index 4dc8441..17a42a3 100644 (file)
--- a/etc/grml/lsb-functions
+++ b/etc/grml/lsb-functions
@@ -30,12 +30,6 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
-if [ "$(cat /proc/1/comm 2>/dev/null)" = "systemd" ] ; then
-  SYSTEMD=true
-else
-  SYSTEMD=false
-fi
-
 # log_*() functions {{{
 TPUT="${TPUT:-"/usr/bin/tput"}"
 
@@ -157,7 +151,7 @@ log_end_msg() {
 # initialisation {{{
 # internal variables
 
-# Dont output to stdout?
+# Don't output to stdout?
 RC_QUIET_STDOUT="no"
 
 # Default values for e-message indentation and dots
@@ -165,7 +159,7 @@ RC_INDENTATION=''
 RC_DEFAULT_INDENT=2
 #RC_DOT_PATTERN=' .'
 RC_DOT_PATTERN=''
-# dont output to stdout?
+# don't output to stdout?
 rc_quiet_stdout="no"
 
 # default values for e-message indentation and dots
@@ -419,9 +413,9 @@ ewend() {
 }
 #}}}
 
-# if we're using systemd then redfine functions for
-# output in systemd style
-if $SYSTEMD ; then
+# if we're using systemd then redefine functions
+# for output in systemd style
+if [ "$(cat /proc/1/comm 2>/dev/null)" = "systemd" ] ; then
   einfo() {
     printf "[  ${GREEN}OK${NORMAL}  ] %s\n" "$*"
   }
@@ -439,7 +433,4 @@ if $SYSTEMD ; then
   }
 fi
 
-# don't expose unneeded local variables
-unset SYSTEMD
-
 # vim: ft=sh tw=80 ts=4 foldmethod=marker