From 9e567cd89d5d0e2908a162f1a537e03c762e4bfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 4 Apr 2024 13:43:01 +0200 Subject: [PATCH] Sync from SUSE:ALP:Source:Standard:1.0 cockpit revision 21a2e7ce1e498ed32d992cd3fe187529 --- cockpit.changes | 5 +++++ cockpit.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cockpit.changes b/cockpit.changes index b73c058..3f76895 100644 --- a/cockpit.changes +++ b/cockpit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 13 11:26:28 UTC 2024 - Miika Alikirri + +- Allow root login on Micro 6 + ------------------------------------------------------------------- Mon Mar 4 13:24:23 UTC 2024 - Adam Majer diff --git a/cockpit.spec b/cockpit.spec index 34b9a52..6546b0a 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -107,8 +107,8 @@ Patch104: selinux_libdir.patch %define build_tests 1 %endif -# Allow root login in Cockpit on RHEL 8 and lower as it also allows password login over SSH. -%if 0%{?rhel} && 0%{?rhel} <= 8 +# Allow root login in Cockpit on SLEM6 and RHEL 8 and lower as it also allows password login over SSH. +%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || 0%{?suse_version} >= 1600 %define disallow_root 0 %else %define disallow_root 1