From 54082858dc4163c06bf0263b1d36c0e18ace12eb Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 20 Jul 2023 08:25:13 -0400 Subject: [PATCH] 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: