diff options
| author | mslifcak <slifcan@gmail.com> | 2018-01-17 17:56:19 +0300 |
|---|---|---|
| committer | Michael Boelen <michael.boelen@cisofy.com> | 2018-01-17 17:56:19 +0300 |
| commit | 173843bdfd009f856aca8c37b1c06d3ff5bea5e6 (patch) | |
| tree | 1cae61d1f9dc0caf8c3db496e5bfcb95093a44a0 /include/tests_boot_services | |
| parent | bc571054c4de724811e6aa47347a028f323c1a39 (diff) | |
Pin svc mgr (#506)
* systemctl does not mean systemd is used
* Check for systemd active
* determine service manager if not already set
Diffstat (limited to 'include/tests_boot_services')
| -rw-r--r-- | include/tests_boot_services | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/include/tests_boot_services b/include/tests_boot_services index 0a2619cb..fbbfd382 100644 --- a/include/tests_boot_services +++ b/include/tests_boot_services @@ -30,7 +30,9 @@ BOOT_LOADER_FOUND=0 BOOT_LOADER_SEARCHED=0 GRUB_VERSION=0 - SERVICE_MANAGER="unknown" + if [ -z "${SERVICE_MANAGER}" ]; then + SERVICE_MANAGER="unknown" + fi # ################################################################################# # @@ -85,27 +87,29 @@ if [ ! -z "${FILENAME}" ]; then SHORTNAME=$(echo ${FILENAME} | ${AWKBINARY} -F/ '{ print $NF }') LogText "Found: ${SHORTNAME}" - case ${SHORTNAME} in - "init" | "initsplash") - SERVICE_MANAGER="SysV Init" - ;; - systemd) - SERVICE_MANAGER="systemd" - ;; - upstart) - SERVICE_MANAGER="upstart" - ;; - *) - CONTAINS_SYSTEMD=$(echo ${SHORTNAME} | ${GREPBINARY} "systemd") - - if [ ! -z "${CONTAINS_SYSTEMD}" ]; then + if [ "${SERVICE_MANAGER}" = "unknown" ]; then + case ${SHORTNAME} in + "init" | "initsplash") + SERVICE_MANAGER="SysV Init" + ;; + systemd) SERVICE_MANAGER="systemd" - else - LogText "Found ${SHORTNAME}. Unclear what service manager this is" - ReportException "${TEST_NO}:001" "Unknown service manager" - fi - ;; - esac + ;; + upstart) + SERVICE_MANAGER="upstart" + ;; + *) + CONTAINS_SYSTEMD=$(echo ${SHORTNAME} | ${GREPBINARY} "systemd") + + if [ ! -z "${CONTAINS_SYSTEMD}" ]; then + SERVICE_MANAGER="systemd" + else + LogText "Found ${SHORTNAME}. Unclear what service manager this is" + ReportException "${TEST_NO}:001" "Unknown service manager" + fi + ;; + esac + fi else LogText "Result: /proc/1/cmdline seems to be empty" ReportException "${TEST_NO}:002" "No data found in /proc/1/cmdline" |