From 54082858dc4163c06bf0263b1d36c0e18ace12eb Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 20 Jul 2023 08:25:13 -0400 Subject: [PATCH 1/4] Update needs_restarting.py --- salt/_modules/needs_restarting.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/salt/_modules/needs_restarting.py b/salt/_modules/needs_restarting.py index c2f7e8b12..c345def9d 100644 --- a/salt/_modules/needs_restarting.py +++ b/salt/_modules/needs_restarting.py @@ -3,22 +3,14 @@ import subprocess def check(): - os = __grains__['os'] + osfam = __grains__['os_family'] retval = 'False' - if os == 'Ubuntu': + if osfam == 'Ubuntu': if path.exists('/var/run/reboot-required'): retval = 'True' - elif os == 'CentOS Stream': - cmd = 'needs-restarting -r > /dev/null 2>&1' - - try: - needs_restarting = subprocess.check_call(cmd, shell=True) - except subprocess.CalledProcessError: - retval = 'True' - - elif os == 'Rocky': + elif cmd = 'needs-restarting -r > /dev/null 2>&1' try: From 14c685ab1076daca568edc5bf5c9a9e6caa72499 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 20 Jul 2023 08:32:19 -0400 Subject: [PATCH 2/4] Update needs_restarting.py --- salt/_modules/needs_restarting.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/_modules/needs_restarting.py b/salt/_modules/needs_restarting.py index c345def9d..6f9fa937c 100644 --- a/salt/_modules/needs_restarting.py +++ b/salt/_modules/needs_restarting.py @@ -6,7 +6,7 @@ def check(): osfam = __grains__['os_family'] retval = 'False' - if osfam == 'Ubuntu': + if osfam == 'Debian': if path.exists('/var/run/reboot-required'): retval = 'True' From e75d0c809403922cdbe869070acfc92210d31993 Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Thu, 20 Jul 2023 08:36:27 -0400 Subject: [PATCH 3/4] Update needs_restarting.py --- salt/_modules/needs_restarting.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/_modules/needs_restarting.py b/salt/_modules/needs_restarting.py index 6f9fa937c..edede9ad3 100644 --- a/salt/_modules/needs_restarting.py +++ b/salt/_modules/needs_restarting.py @@ -10,7 +10,7 @@ def check(): if path.exists('/var/run/reboot-required'): retval = 'True' - elif + elif osfam == 'RedHat': cmd = 'needs-restarting -r > /dev/null 2>&1' try: From 3071a1de41c5684ad74153227cf2985d22ecfe05 Mon Sep 17 00:00:00 2001 From: Josh Patterson Date: Thu, 20 Jul 2023 08:42:27 -0400 Subject: [PATCH 4/4] Update map.jinja --- salt/repo/client/map.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/repo/client/map.jinja b/salt/repo/client/map.jinja index b31fca2d2..94228c300 100644 --- a/salt/repo/client/map.jinja +++ b/salt/repo/client/map.jinja @@ -1,6 +1,6 @@ {% from 'vars/globals.map.jinja' import GLOBALS %} -{% if GLOBALS.os_family == 'Redhat' %} +{% if GLOBALS.os_family == 'RedHat' %} {% set REPOPATH = '/etc/yum.repos.d/' %} {% if GLOBALS.os == 'OEL' %} {% set ABSENTFILES = [