Fis error in determin if systemd support is present in case of debian 13 and newer.
This commit is contained in:
@@ -227,7 +227,7 @@ systemd_supported=false
|
|||||||
systemd=$(which systemd)
|
systemd=$(which systemd)
|
||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -190,7 +190,7 @@ systemd_supported=false
|
|||||||
systemd=$(which systemd)
|
systemd=$(which systemd)
|
||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -177,7 +177,7 @@ systemd_supported=false
|
|||||||
systemd=$(which systemd)
|
systemd=$(which systemd)
|
||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -163,7 +163,7 @@ systemd_supported=false
|
|||||||
systemd=$(which systemd)
|
systemd=$(which systemd)
|
||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -89,9 +89,10 @@ fi
|
|||||||
|
|
||||||
# - Is this a systemd system?
|
# - Is this a systemd system?
|
||||||
# -
|
# -
|
||||||
if [[ "X`which systemd`" = "X" ]]; then
|
systemd=$(which systemd)
|
||||||
systemd_exists=false
|
systemctl=$(which systemctl)
|
||||||
else
|
|
||||||
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_exists=true
|
systemd_exists=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -134,7 +134,7 @@ systemd=$(which systemd)
|
|||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
systemd_supported=false
|
systemd_supported=false
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -116,7 +116,7 @@ systemd=$(which systemd)
|
|||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
systemd_supported=false
|
systemd_supported=false
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -145,7 +145,7 @@ systemd=$(which systemd)
|
|||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
systemd_supported=false
|
systemd_supported=false
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -145,7 +145,7 @@ systemd=$(which systemd)
|
|||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
systemd_supported=false
|
systemd_supported=false
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -145,7 +145,7 @@ systemd=$(which systemd)
|
|||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
systemd_supported=false
|
systemd_supported=false
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -172,7 +172,7 @@ systemd=$(which systemd)
|
|||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
systemd_supported=false
|
systemd_supported=false
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
else
|
else
|
||||||
if [[ ! -x $bind_init_script ]]; then
|
if [[ ! -x $bind_init_script ]]; then
|
||||||
|
|||||||
@@ -115,7 +115,7 @@ systemd=$(which systemd)
|
|||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
systemd_supported=false
|
systemd_supported=false
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -134,7 +134,7 @@ systemd=$(which systemd)
|
|||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
systemd_supported=false
|
systemd_supported=false
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -317,7 +317,7 @@ systemd=$(which systemd)
|
|||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
systemd_supported=false
|
systemd_supported=false
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -151,7 +151,7 @@ systemd=$(which systemd)
|
|||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
systemd_supported=false
|
systemd_supported=false
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
else
|
else
|
||||||
fatal "Support of systemd is requirred for this script"
|
fatal "Support of systemd is requirred for this script"
|
||||||
|
|||||||
@@ -151,7 +151,7 @@ systemd=$(which systemd)
|
|||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
systemd_supported=false
|
systemd_supported=false
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -145,7 +145,7 @@ systemd=$(which systemd)
|
|||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
systemd_supported=false
|
systemd_supported=false
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -151,7 +151,7 @@ systemd=$(which systemd)
|
|||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
systemd_supported=false
|
systemd_supported=false
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -145,7 +145,7 @@ systemd=$(which systemd)
|
|||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
systemd_supported=false
|
systemd_supported=false
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
else
|
else
|
||||||
if [[ ! -x $postfix_init_script ]]; then
|
if [[ ! -x $postfix_init_script ]]; then
|
||||||
|
|||||||
@@ -134,7 +134,7 @@ systemd=$(which systemd)
|
|||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
systemd_supported=false
|
systemd_supported=false
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -134,7 +134,7 @@ systemd=$(which systemd)
|
|||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
systemd_supported=false
|
systemd_supported=false
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -186,7 +186,7 @@ systemd=$(which systemd)
|
|||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
systemd_supported=false
|
systemd_supported=false
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -147,7 +147,7 @@ systemd=$(which systemd)
|
|||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
systemd_supported=false
|
systemd_supported=false
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -107,7 +107,7 @@ systemd=$(which systemd)
|
|||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
systemd_supported=false
|
systemd_supported=false
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -110,7 +110,7 @@ systemd=$(which systemd)
|
|||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
systemd_supported=false
|
systemd_supported=false
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -195,7 +195,7 @@ systemd=$(which systemd)
|
|||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
systemd_supported=false
|
systemd_supported=false
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -240,7 +240,7 @@ systemd=$(which systemd)
|
|||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
systemd_supported=false
|
systemd_supported=false
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
else
|
else
|
||||||
fatal "Systemd is not present!"
|
fatal "Systemd is not present!"
|
||||||
|
|||||||
@@ -140,7 +140,7 @@ systemd=$(which systemd)
|
|||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
systemd_supported=false
|
systemd_supported=false
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
else
|
else
|
||||||
if [[ ! -x $init_script ]]; then
|
if [[ ! -x $init_script ]]; then
|
||||||
|
|||||||
@@ -345,7 +345,7 @@ if ! $vserver_guest ; then
|
|||||||
systemd=$(which systemd)
|
systemd=$(which systemd)
|
||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -189,7 +189,7 @@ systemd=$(which systemd)
|
|||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
systemd_supported=false
|
systemd_supported=false
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -101,7 +101,7 @@ systemd=$(which systemd)
|
|||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
systemd_supported=false
|
systemd_supported=false
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -137,7 +137,7 @@ systemd=$(which systemd)
|
|||||||
systemctl=$(which systemctl)
|
systemctl=$(which systemctl)
|
||||||
|
|
||||||
systemd_supported=false
|
systemd_supported=false
|
||||||
if [[ -n "$systemd" ]] && [[ -n "$systemctl" ]] ; then
|
if [[ -n "$systemd" ]] || [[ -n "$systemctl" ]] ; then
|
||||||
systemd_supported=true
|
systemd_supported=true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user