From b9e95aa4baac836448f296e45e51b8913dc6bfe7 Mon Sep 17 00:00:00 2001 From: Marga Manterola Date: Tue, 7 Apr 2020 12:10:07 +0200 Subject: [PATCH] sys-apps/systemd: Adapt the sed command to new version After systemd version 243, the lines that sed is removing now include an exclamation mark, this commit adapts the sed command to accept both formats. These lines need to be removed so that the configuration set in /usr/lib/tmpfiles.d/pam.conf file can be used (duplicate entries will lead to systemd not doing anything). The pam.conf configuration is shipped by of the pam package: https://github.com/flatcar-linux/coreos-overlay/blob/flatcar-master/sys-libs/pam/files/tmpfiles.d/pam.conf Fixes: flatcar-linux/Flatcar#75 --- .../coreos-overlay/sys-apps/systemd/systemd-9999.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild index 6399a8994d..a23ea1fb45 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild @@ -422,8 +422,8 @@ multilib_src_install_all() { # Do not ship distro-specific files (nsswitch.conf pam.d) rm -rf "${ED}"/usr/share/factory sed -i "${ED}"/usr/lib/tmpfiles.d/etc.conf \ - -e '/^C \/etc\/nsswitch\.conf/d' \ - -e '/^C \/etc\/pam\.d/d' + -e '/^C!* \/etc\/nsswitch\.conf/d' \ + -e '/^C!* \/etc\/pam\.d/d' } migrate_locale() {