From c53258baf2aef15c571dfc0efb81acd6073bf115 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Mon, 31 Mar 2025 17:41:00 +0100 Subject: [PATCH] sys-auth/google-oslogin: Generate nsswitch.conf from baselayout version We were supposed to keep these in sync, but we haven't for 7 years. The only difference is a couple of entries on the end of two lines, so let's just use sed. Signed-off-by: James Le Cuirot --- .../google-oslogin/files/nsswitch.conf | 19 ------------------- .../google-oslogin-20250123.00.ebuild | 10 +++++++++- 2 files changed, 9 insertions(+), 20 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/files/nsswitch.conf diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/files/nsswitch.conf b/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/files/nsswitch.conf deleted file mode 100644 index 07af435bc0..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/files/nsswitch.conf +++ /dev/null @@ -1,19 +0,0 @@ -# /etc/nsswitch.conf: -# Keep this in sync with nsswitch.conf from coreos/baselayout -passwd: files usrfiles sss systemd cache_oslogin oslogin -shadow: files usrfiles sss -group: files usrfiles sss systemd cache_oslogin oslogin - -hosts: files usrfiles dns myhostname -networks: files usrfiles dns - -services: files usrfiles -protocols: files usrfiles -rpc: files usrfiles - -ethers: files -netmasks: files -netgroup: files -bootparams: files -automount: files -aliases: files diff --git a/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/google-oslogin-20250123.00.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/google-oslogin-20250123.00.ebuild index b86e81bddd..62e5a059df 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/google-oslogin-20250123.00.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-auth/google-oslogin/google-oslogin-20250123.00.ebuild @@ -28,6 +28,10 @@ RDEPEND=" !systemd? ( virtual/cron ) " +DEPEND+=" + sys-apps/baselayout +" + BDEPEND=" virtual/pkgconfig " @@ -71,8 +75,12 @@ src_install() { insinto /usr/share/google-oslogin doins "${FILESDIR}/sshd_config" doins "${FILESDIR}/60-flatcar-google-oslogin.conf" - doins "${FILESDIR}/nsswitch.conf" doins "${FILESDIR}/pam_sshd" doins "${FILESDIR}/oslogin-sudoers" doins "${FILESDIR}/group.conf" + + # Append oslogin databases to the regular nsswitch.conf. + sed -r 's/^(passwd|group):.*/\0 cache_oslogin oslogin/' \ + "${ESYSROOT}"/usr/share/baselayout/nsswitch.conf | + newins - nsswitch.conf }