elie/debian-cis
1
0
Fork 0
mirror of https://github.com/ovh/debian-cis.git synced 2025-08-31 11:54:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: issue #283 (#284)

Browse Source 
Use a more simple and generic way to ensure systemctl is present

Co-authored-by: damien cavagnini <damien.cavagnini@corp.ovh.com>
This commit is contained in:
damcav35
2025-08-07 16:08:51 +02:00
committed by GitHub
parent fe8f0bd0b4
commit 6b1ce6787d
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/utils.sh
View File

@@ -320,9 +320,8 @@ is_service_enabled() {
# if running in a container, it does not make much sense to test for systemd / service # if running in a container, it does not make much sense to test for systemd / service
# the var "IS_CONTAINER" defined in lib/constant may not be enough, in case we are using systemd slices # the var "IS_CONTAINER" defined in lib/constant may not be enough, in case we are using systemd slices
# currently, did not find a unified way to manage all cases, so we check this only for systemctl usage # currently, did not find a unified way to manage all cases, so we check this only for systemctl usage
is_using_sbin_init is_systemctl_running
if [ "$FNRET" -eq 1 ]; then if [ "$FNRET" -eq 1 ]; then
debug "host was not started using '/sbin/init', systemd should not be available"
FNRET=1 FNRET=1
return return
fi fi
@@ -668,11 +667,10 @@ is_running_in_container() {
awk -F/ '$2 == "'"$1"'"' /proc/self/cgroup awk -F/ '$2 == "'"$1"'"' /proc/self/cgroup
} }
is_using_sbin_init() { is_systemctl_running() {
FNRET=0 FNRET=0
# remove '\0' to avoid 'command substitution: ignored null byte in input' if ! systemctl >/dev/null 2>&1; then
if [[ $($SUDO_CMD cat /proc/1/cmdline | tr -d '\0') != "/sbin/init" ]]; then debug "systemctl is not running"
debug "init process is not '/sbin/init'"
FNRET=1 FNRET=1
fi fi
} }
@@ -681,9 +679,8 @@ manage_service() {
local action="$1" local action="$1"
local service="$2" local service="$2"
is_using_sbin_init is_systemctl_running
if [ "$FNRET" -ne 0 ]; then if [ "$FNRET" -ne 0 ]; then
debug "/sbin/init not used, systemctl wont manage service $service"
return return
fi fi