47 lines
2.9 KiB
Diff
47 lines
2.9 KiB
Diff
From 1013f9754c376aec255960b9e82080172f618486 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrezina@redhat.com>
|
|
Date: Wed, 25 Nov 2020 14:05:00 +0100
|
|
Subject: [PATCH 3/5] rhel9: Revert "profiles: add support for resolved"
|
|
|
|
systemd-resolved should not be enabled by default on rhel8.
|
|
|
|
This reverts commit c5294c508a940291440eb32d5d750f33baf1ae54.
|
|
|
|
Patch-name: 0903-rhel9-Revert-profiles-add-support-for-resolved.patch
|
|
Patch-id: 903
|
|
From-dist-git-commit: 8461b94b1539db7f26c288e0d5d20dd71e6609bf
|
|
---
|
|
profiles/minimal/nsswitch.conf | 2 +-
|
|
profiles/nis/nsswitch.conf | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/profiles/minimal/nsswitch.conf b/profiles/minimal/nsswitch.conf
|
|
index 82dd45f1eaf6623f97199079c48c80515b156afc..112236e326b10cd74b304827dd241c0d8b5f34e2 100644
|
|
--- a/profiles/minimal/nsswitch.conf
|
|
+++ b/profiles/minimal/nsswitch.conf
|
|
@@ -3,7 +3,7 @@ automount: files {exclude if "with-custom
|
|
ethers: files {exclude if "with-custom-ethers"}
|
|
group: files {if "with-altfiles":altfiles }systemd {exclude if "with-custom-group"} {exclude if "with-group-merging"}
|
|
group: files [SUCCESS=merge] {if "with-altfiles":altfiles [SUCCESS=merge] }systemd {exclude if "with-custom-group"} {include if "with-group-merging"}
|
|
-hosts: resolve [!UNAVAIL=return] files myhostname dns {exclude if "with-custom-hosts"}
|
|
+hosts: files dns myhostname {exclude if "with-custom-hosts"}
|
|
initgroups: files {exclude if "with-custom-initgroups"}
|
|
netgroup: files {exclude if "with-custom-netgroup"}
|
|
networks: files {exclude if "with-custom-networks"}
|
|
diff --git a/profiles/nis/nsswitch.conf b/profiles/nis/nsswitch.conf
|
|
index c395b9670c48fd5f95160a5765b176c3382cd967..5fc8292c238ef474ef646b3da57f51355f5d0cb3 100644
|
|
--- a/profiles/nis/nsswitch.conf
|
|
+++ b/profiles/nis/nsswitch.conf
|
|
@@ -3,7 +3,7 @@ automount: files nis {exclude if "with-custom-automount"}
|
|
ethers: files nis {exclude if "with-custom-ethers"}
|
|
group: files {if "with-altfiles":altfiles }nis systemd {exclude if "with-custom-group"} {exclude if "with-group-merging"}
|
|
group: files [SUCCESS=merge] {if "with-altfiles":altfiles [SUCCESS=merge] }nis [SUCCESS=merge] systemd {exclude if "with-custom-group"} {include if "with-group-merging"}
|
|
-hosts: resolve [!UNAVAIL=return] files nis myhostname dns {exclude if "with-custom-hosts"}
|
|
+hosts: files nis dns myhostname {exclude if "with-custom-hosts"}
|
|
initgroups: files nis {exclude if "with-custom-initgroups"}
|
|
netgroup: files nis {exclude if "with-custom-netgroup"}
|
|
networks: files nis {exclude if "with-custom-networks"}
|
|
--
|
|
2.54.0
|
|
|