diff --git a/java/code/src/com/suse/manager/utils/SaltUtils.java b/java/code/src/com/suse/manager/utils/SaltUtils.java index 5949eac8c4eb..893d150491a8 100644 --- a/java/code/src/com/suse/manager/utils/SaltUtils.java +++ b/java/code/src/com/suse/manager/utils/SaltUtils.java @@ -1536,8 +1536,10 @@ else if ("debian".equalsIgnoreCase(grains.getValueAsString("os"))) { .orElse(null)); result.getRebootRequired() - .map(flag -> (Boolean) flag.getChanges().getRet().get("reboot_required")) - .ifPresent(flag -> server.setRebootRequiredAfter(flag ? new Date() : null)); + .map(rr -> rr.getChanges().getRet()) + .filter(Objects::nonNull) + .map(ret -> (Boolean) ret.get("reboot_required")) + .ifPresent(flag -> server.setRebootRequiredAfter(flag ? new Date() : null)); // Update live patching version server.setKernelLiveVersion(result.getKernelLiveVersionInfo() diff --git a/java/spacewalk-java.changes.welder.fix-centos7-pkg-profile-update b/java/spacewalk-java.changes.welder.fix-centos7-pkg-profile-update new file mode 100644 index 000000000000..c33cefee7203 --- /dev/null +++ b/java/spacewalk-java.changes.welder.fix-centos7-pkg-profile-update @@ -0,0 +1 @@ +- Fix package profile update on CentOS 7 when yum-utils is not installed (bsc#1227133) diff --git a/susemanager-utils/susemanager-sls/salt/packages/profileupdate.sls b/susemanager-utils/susemanager-sls/salt/packages/profileupdate.sls index 6d616a053aac..e65b1e37f6de 100644 --- a/susemanager-utils/susemanager-sls/salt/packages/profileupdate.sls +++ b/susemanager-utils/susemanager-sls/salt/packages/profileupdate.sls @@ -53,6 +53,10 @@ status_uptime: reboot_required: mgrcompat.module_run: - name: reboot_info.reboot_required + {%- if grains['os_family'] == 'RedHat' and grains['osmajorrelease'] < 8 %} + - onlyif: + - which needs-restarting + {%- endif %} {%- endif %} kernel_live_version: diff --git a/susemanager-utils/susemanager-sls/susemanager-sls.changes.welder.fix-centos7-pkg-profile-update b/susemanager-utils/susemanager-sls/susemanager-sls.changes.welder.fix-centos7-pkg-profile-update new file mode 100644 index 000000000000..c33cefee7203 --- /dev/null +++ b/susemanager-utils/susemanager-sls/susemanager-sls.changes.welder.fix-centos7-pkg-profile-update @@ -0,0 +1 @@ +- Fix package profile update on CentOS 7 when yum-utils is not installed (bsc#1227133)