From 67e77500f3249b6c7eda131dc196f19d90642083 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 4 Mar 2014 16:56:19 -0800 Subject: [PATCH] fix(sys-apps/systemd): Don't enable services in /etc, move to /usr --- .../{systemd-207-r5.ebuild => systemd-207-r6.ebuild} | 0 .../sys-apps/systemd/systemd-207.ebuild | 9 +++++++++ .../sys-apps/systemd/systemd-210.ebuild | 12 ++++++++++++ .../sys-apps/systemd/systemd-9999.ebuild | 12 ++++++++++++ 4 files changed, 33 insertions(+) rename sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/{systemd-207-r5.ebuild => systemd-207-r6.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-207-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-207-r6.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-207-r5.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-207-r6.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-207.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-207.ebuild index 6ab5e40640..62d250e8e8 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-207.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-207.ebuild @@ -264,6 +264,15 @@ multilib_src_install_all() { # Don't default to graphical.target rm "${D}"/usr/lib/systemd/system/default.target || die dosym multi-user.target /usr/lib/systemd/system/default.target + + # Move a few services enabled in /etc to /usr + rm "${D}"/etc/systemd/system/getty.target.wants/getty@tty1.service || die + rmdir "${D}"/etc/systemd/system/getty.target.wants || die + dosym ../getty@.service /usr/lib/systemd/system/getty.target.wants/getty@tty1.service + + rm "${D}"/etc/systemd/system/multi-user.target.wants/remote-fs.target || die + rmdir "${D}"/etc/systemd/system/multi-user.target.wants || die + systemd_enable_service multi-user.target remote-fs.target } pkg_postinst() { diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-210.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-210.ebuild index 8918cb649b..951a917538 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-210.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-210.ebuild @@ -344,6 +344,18 @@ multilib_src_install_all() { # Don't default to graphical.target rm "${D}"/usr/lib/systemd/system/default.target || die dosym multi-user.target /usr/lib/systemd/system/default.target + + # Move a few services enabled in /etc to /usr + rm "${D}"/etc/systemd/system/getty.target.wants/getty@tty1.service || die + rmdir "${D}"/etc/systemd/system/getty.target.wants || die + dosym ../getty@.service /usr/lib/systemd/system/getty.target.wants/getty@tty1.service + + rm "${D}"/etc/systemd/system/multi-user.target.wants/remote-fs.target \ + "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service \ + || die + rmdir "${D}"/etc/systemd/system/multi-user.target.wants || die + systemd_enable_service multi-user.target remote-fs.target + systemd_enable_service multi-user.target systemd-networkd.service } 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 618ed1a0c8..1d7e474d07 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 @@ -351,6 +351,18 @@ multilib_src_install_all() { # Don't default to graphical.target rm "${D}"/usr/lib/systemd/system/default.target || die dosym multi-user.target /usr/lib/systemd/system/default.target + + # Move a few services enabled in /etc to /usr + rm "${D}"/etc/systemd/system/getty.target.wants/getty@tty1.service || die + rmdir "${D}"/etc/systemd/system/getty.target.wants || die + dosym ../getty@.service /usr/lib/systemd/system/getty.target.wants/getty@tty1.service + + rm "${D}"/etc/systemd/system/multi-user.target.wants/remote-fs.target \ + "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service \ + || die + rmdir "${D}"/etc/systemd/system/multi-user.target.wants || die + systemd_enable_service multi-user.target remote-fs.target + systemd_enable_service multi-user.target systemd-networkd.service } migrate_locale() {