From 093e482777e4350bff733d8ae1e03ca6adff7ff4 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 18 Dec 2014 17:10:39 -0800 Subject: [PATCH] systemd: remove generic /usr/share/factory This conflicts with our own configuration provided by baselayout. --- .../{systemd-217-r4.ebuild => systemd-217-r5.ebuild} | 6 ++++++ .../coreos-overlay/sys-apps/systemd/systemd-9999.ebuild | 6 ++++++ 2 files changed, 12 insertions(+) rename sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/{systemd-217-r4.ebuild => systemd-217-r5.ebuild} (98%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-217-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-217-r5.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-217-r4.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-217-r5.ebuild index b447c4797c..04e23a5e7c 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-217-r4.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-217-r5.ebuild @@ -411,6 +411,12 @@ multilib_src_install_all() { # Disable the "First Boot Wizard" by default, it isn't very applicable to CoreOS rm "${D}"/usr/lib/systemd/system/sysinit.target.wants/systemd-firstboot.service + + # Do not ship distro-specific files (nsswitch.conf pam.d) + rm -rf "${D}"/usr/share/factory + sed -i "${D}"/usr/lib/tmpfiles.d/etc.conf \ + -e '/^C \/etc\/nsswitch\.conf/d' \ + -e '/^C \/etc\/pam\.d/d' } migrate_locale() { 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 8a7f3928ab..69433a4cbb 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 @@ -402,6 +402,12 @@ multilib_src_install_all() { # Disable the "First Boot Wizard" by default, it isn't very applicable to CoreOS rm "${D}"/usr/lib/systemd/system/sysinit.target.wants/systemd-firstboot.service + + # Do not ship distro-specific files (nsswitch.conf pam.d) + rm -rf "${D}"/usr/share/factory + sed -i "${D}"/usr/lib/tmpfiles.d/etc.conf \ + -e '/^C \/etc\/nsswitch\.conf/d' \ + -e '/^C \/etc\/pam\.d/d' } migrate_locale() {