769624aac3
- Disable group merging by default, use with-group-merging to enable it (RHEL-94650) Resolves: RHEL-112169
69 lines
5.5 KiB
Diff
69 lines
5.5 KiB
Diff
From 6c3b60c1f71b7c538371d57289353d1f82d6174a Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrezina@redhat.com>
|
|
Date: Fri, 23 Feb 2024 16:01:58 +0100
|
|
Subject: [PATCH 3/4] rhel10: remove systemd-resolved
|
|
|
|
systemd-resolved should not be enabled by default in rhel.
|
|
---
|
|
profiles/local/nsswitch.conf | 2 +-
|
|
profiles/nis/nsswitch.conf | 2 +-
|
|
profiles/sssd/nsswitch.conf | 2 +-
|
|
profiles/winbind/nsswitch.conf | 2 +-
|
|
4 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/profiles/local/nsswitch.conf b/profiles/local/nsswitch.conf
|
|
index 2cb92da4f1e5fdd7fc0e14779456b00eb16d57de..d45726d73eb62e3bbce5f049c4fcce188aaabd86 100644
|
|
--- a/profiles/local/nsswitch.conf
|
|
+++ b/profiles/local/nsswitch.conf
|
|
@@ -3,7 +3,7 @@ passwd: files {if "with-altfiles":altfiles }systemd
|
|
shadow: files systemd
|
|
group: files {if "with-altfiles":altfiles }systemd {exclude if "with-group-merging"}
|
|
group: files [SUCCESS=merge] {if "with-altfiles":altfiles [SUCCESS=merge] }systemd [SUCCESS=merge] {include if "with-group-merging"}
|
|
-hosts: files myhostname {if "with-libvirt":libvirt libvirt_guest }{if "with-mdns4" and "with-mdns6":mdns_minimal [NOTFOUND=return] }{if "with-mdns4" and not "with-mdns6":mdns4_minimal [NOTFOUND=return] }{if not "with-mdns4" and "with-mdns6":mdns6_minimal [NOTFOUND=return] }resolve [!UNAVAIL=return] dns
|
|
+hosts: files myhostname {if "with-libvirt":libvirt libvirt_guest }{if "with-mdns4" and "with-mdns6":mdns_minimal [NOTFOUND=return] }{if "with-mdns4" and not "with-mdns6":mdns4_minimal [NOTFOUND=return] }{if not "with-mdns4" and "with-mdns6":mdns6_minimal [NOTFOUND=return] } dns
|
|
services: files
|
|
netgroup: files
|
|
automount: files
|
|
diff --git a/profiles/nis/nsswitch.conf b/profiles/nis/nsswitch.conf
|
|
index 061d226c62e85e5782f860527e043ad8bf44c76e..a70ecc24eec4bc93fc58867477a53720007f375e 100644
|
|
--- a/profiles/nis/nsswitch.conf
|
|
+++ b/profiles/nis/nsswitch.conf
|
|
@@ -3,7 +3,7 @@ passwd: files {if "with-altfiles":altfiles }nis systemd
|
|
shadow: files nis systemd
|
|
group: files {if "with-altfiles":altfiles }nis systemd {exclude if "with-group-merging"}
|
|
group: files [SUCCESS=merge] {if "with-altfiles":altfiles [SUCCESS=merge] }nis [SUCCESS=merge] systemd [SUCCESS=merge] {include if "with-group-merging"}
|
|
-hosts: files myhostname {if "with-libvirt":libvirt libvirt_guest }{if "with-mdns4" and "with-mdns6":mdns_minimal [NOTFOUND=return] }{if "with-mdns4" and not "with-mdns6":mdns4_minimal [NOTFOUND=return] }{if not "with-mdns4" and "with-mdns6":mdns6_minimal [NOTFOUND=return] }resolve [!UNAVAIL=return] nis dns
|
|
+hosts: files myhostname {if "with-libvirt":libvirt libvirt_guest }{if "with-mdns4" and "with-mdns6":mdns_minimal [NOTFOUND=return] }{if "with-mdns4" and not "with-mdns6":mdns4_minimal [NOTFOUND=return] }{if not "with-mdns4" and "with-mdns6":mdns6_minimal [NOTFOUND=return] }nis dns
|
|
services: files nis
|
|
netgroup: files nis
|
|
automount: files nis
|
|
diff --git a/profiles/sssd/nsswitch.conf b/profiles/sssd/nsswitch.conf
|
|
index b7eaf8be6bc7f96a10a5876dd27c70364428c9f8..955048b6b869b41003eb3f57ef6297188da67141 100644
|
|
--- a/profiles/sssd/nsswitch.conf
|
|
+++ b/profiles/sssd/nsswitch.conf
|
|
@@ -3,7 +3,7 @@ passwd: {if "with-tlog":sss }files {if "with-altfiles":altfiles }{if not "wi
|
|
shadow: files systemd
|
|
group: {if "with-tlog":sss }files {if "with-altfiles":altfiles }{if not "with-tlog":sss }systemd {exclude if "with-group-merging"}
|
|
group: {if "with-tlog":sss [SUCCESS=merge] }files [SUCCESS=merge] {if "with-altfiles":altfiles [SUCCESS=merge] }{if not "with-tlog":sss [SUCCESS=merge] }systemd [SUCCESS=merge] {include if "with-group-merging"}
|
|
-hosts: files myhostname {if "with-libvirt":libvirt libvirt_guest }{if "with-mdns4" and "with-mdns6":mdns_minimal [NOTFOUND=return] }{if "with-mdns4" and not "with-mdns6":mdns4_minimal [NOTFOUND=return] }{if not "with-mdns4" and "with-mdns6":mdns6_minimal [NOTFOUND=return] }resolve [!UNAVAIL=return] dns
|
|
+hosts: files myhostname {if "with-libvirt":libvirt libvirt_guest }{if "with-mdns4" and "with-mdns6":mdns_minimal [NOTFOUND=return] }{if "with-mdns4" and not "with-mdns6":mdns4_minimal [NOTFOUND=return] }{if not "with-mdns4" and "with-mdns6":mdns6_minimal [NOTFOUND=return] } dns
|
|
services: files sss
|
|
netgroup: files sss
|
|
sudoers: files sss {include if "with-sudo"}
|
|
diff --git a/profiles/winbind/nsswitch.conf b/profiles/winbind/nsswitch.conf
|
|
index 5df6b60f88d7da99be85bef3fb009522fe43abe1..76a0a8a7babc24df949e1d8b246f36a3a2e14d93 100644
|
|
--- a/profiles/winbind/nsswitch.conf
|
|
+++ b/profiles/winbind/nsswitch.conf
|
|
@@ -3,7 +3,7 @@ passwd: files {if "with-altfiles":altfiles }winbind systemd
|
|
shadow: files systemd
|
|
group: files {if "with-altfiles":altfiles }winbind systemd {exclude if "with-group-merging"}
|
|
group: files [SUCCESS=merge] {if "with-altfiles":altfiles [SUCCESS=merge] }winbind [SUCCESS=merge] systemd [SUCCESS=merge] {include if "with-group-merging"}
|
|
-hosts: files myhostname {if "with-libvirt":libvirt libvirt_guest }{if "with-mdns4" and "with-mdns6":mdns_minimal [NOTFOUND=return] }{if "with-mdns4" and not "with-mdns6":mdns4_minimal [NOTFOUND=return] }{if not "with-mdns4" and "with-mdns6":mdns6_minimal [NOTFOUND=return] }resolve [!UNAVAIL=return] dns
|
|
+hosts: files myhostname {if "with-libvirt":libvirt libvirt_guest }{if "with-mdns4" and "with-mdns6":mdns_minimal [NOTFOUND=return] }{if "with-mdns4" and not "with-mdns6":mdns4_minimal [NOTFOUND=return] }{if not "with-mdns4" and "with-mdns6":mdns6_minimal [NOTFOUND=return] } dns
|
|
services: files
|
|
netgroup: files
|
|
automount: files
|
|
--
|
|
2.54.0
|
|
|