From eb4ef2c111b3b439bda66cc0ac8764343e9d6d6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20B=C5=99ezina?= Date: Mon, 20 Jul 2020 11:36:14 +0200 Subject: [PATCH 2/2] profiles: add support for resolved Resolved is enabled by default since Fedora 33 so we need to reflect this change in our profiles. It should be OK to enabled it unconditionaly. The module is part of systemd so it basically can not be uninstalled and it can be safely disabled through `systemctl disable --now systemd-resolved.service`. Resolves: https://github.com/authselect/authselect/issues/221 --- 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 a39e4d32ebf79e8bf05f2db5753b01596222dc35..7df28821dbb03eaf986660a016a48051eb91d092 100644 --- a/profiles/minimal/nsswitch.conf +++ b/profiles/minimal/nsswitch.conf @@ -2,7 +2,7 @@ aliases: files {exclude if "with-custom automount: files {exclude if "with-custom-automount"} ethers: files {exclude if "with-custom-ethers"} group: files {if "with-altfiles":altfiles }systemd {exclude if "with-custom-group"} -hosts: files dns myhostname {exclude if "with-custom-hosts"} +hosts: resolve [!UNAVAIL=return] myhostname files dns {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 9bee7d839f84ff39d54cb6ead9dea38e51736b4d..1aaa2d99eb004851eb2413e7722d971d2e3bc7eb 100644 --- a/profiles/nis/nsswitch.conf +++ b/profiles/nis/nsswitch.conf @@ -2,7 +2,7 @@ aliases: files nis {exclude if "with-custom-aliases"} automount: files nis {exclude if "with-custom-automount"} ethers: files nis {exclude if "with-custom-ethers"} group: files nis systemd {exclude if "with-custom-group"} -hosts: files nis dns myhostname {exclude if "with-custom-hosts"} +hosts: resolve [!UNAVAIL=return] myhostname files dns {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.25.4