From 9b5c37fa3920047386cddc57ffbcb34b889e7cf7 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Tue, 12 May 2015 13:50:02 -0700
Subject: [PATCH] systemd: enable systemd-timesyncd

In the process clean up moving units from /etc to /usr, the current goo
was sloppy and sometimes missed when systemd added new things to /etc.
For example we didn't move systemd-networkd.socket, added in 219.
---
 ...md-219-r7.ebuild => systemd-219-r8.ebuild} |  0
 .../sys-apps/systemd/systemd-9999.ebuild      | 53 ++++++++++---------
 2 files changed, 28 insertions(+), 25 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/{systemd-219-r7.ebuild => systemd-219-r8.ebuild} (100%)

diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-219-r7.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-219-r8.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-219-r7.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-219-r8.ebuild
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 ecc712f837..426a31dc47 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
@@ -340,6 +340,8 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
+	local unitdir=$(systemd_get_unitdir)
+
 	prune_libtool_files --modules
 	einstalldocs
 
@@ -347,9 +349,9 @@ multilib_src_install_all() {
 		local prefix
 		use symlink-usr && prefix=/usr
 		for app in halt poweroff reboot runlevel shutdown telinit; do
-			dosym "/${ROOTPREFIX-/usr}/bin/systemctl" ${prefix}/sbin/${app}
+			dosym "${ROOTPREFIX-/usr}/bin/systemctl" ${prefix}/sbin/${app}
 		done
-		dosym "/${ROOTPREFIX-/usr}/lib/systemd/systemd" ${prefix}/sbin/init
+		dosym "${ROOTPREFIX-/usr}/lib/systemd/systemd" ${prefix}/sbin/init
 	else
 		# we just keep sysvinit tools, so no need for the mans
 		rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
@@ -369,31 +371,32 @@ multilib_src_install_all() {
 	systemd_dotmpfilesd "${FILESDIR}"/systemd-resolv.conf
 
 	# 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
+	rm "${D}${unitdir}"/default.target || die
+	dosym multi-user.target "${unitdir}"/default.target
 
-	# If we install these symlinks, there is no way for the sysadmin to remove them
-	# permanently.
-	rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
-	rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
-	rm -r "${D}"/etc/systemd/system/network-online.target.wants || die
-	rm -r "${D}"/etc/systemd/system/sysinit.target.wants || die
+	# Move a few services enabled in /etc to /usr, delete files individually
+	# so builds fail if systemd adds any new unexpected stuff to /etc
+	local f
+	for f in \
+		getty.target.wants/getty@tty1.service \
+		multi-user.target.wants/remote-fs.target \
+		multi-user.target.wants/systemd-networkd.service \
+		multi-user.target.wants/systemd-resolved.service \
+		network-online.target.wants/systemd-networkd-wait-online.service \
+		sockets.target.wants/systemd-networkd.socket \
+		sysinit.target.wants/systemd-timesyncd.service
+	do
+		local s="${f#*/}" t="${f%/*}"
+		local u="${s/@*.service/@.service}"
 
-	# Move a few services enabled in /etc to /usr
-	# systemd-timesyncd is left disabled, we currently use ntpd
-	rm -f "${D}"/etc/systemd/system/getty.target.wants/getty@tty1.service
-	rm -f "${D}"/etc/systemd/system/multi-user.target.wants/remote-fs.target
+		# systemd_enable_service doesn't understand template units
+		einfo "Enabling ${s} via ${t}"
+		dodir "${unitdir}/${t}"
+		dosym "../${u}" "${unitdir}/${t}/${s}"
 
-	rm -f "${D}"/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service
-	rmdir "${D}"/etc/systemd/system/getty.target.wants \
-		"${D}"/etc/systemd/system/multi-user.target.wants \
-		|| die
-
-	dosym ../getty@.service /usr/lib/systemd/system/getty.target.wants/getty@tty1.service
-	systemd_enable_service multi-user.target remote-fs.target
-	systemd_enable_service multi-user.target systemd-networkd.service
-	systemd_enable_service multi-user.target systemd-resolved.service
-	systemd_enable_service network-online.target systemd-networkd-wait-online.service
+		rm "${D}/etc/systemd/system/${f}" || die
+	done
+	rmdir "${D}"/etc/systemd/system/*.wants || die
 
 	# Grant networkd access to set the transient host name
 	insinto /usr/share/polkit-1/rules.d
@@ -405,7 +408,7 @@ multilib_src_install_all() {
 	doins "${FILESDIR}"/99-default.preset
 
 	# 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
+	rm "${D}${unitdir}"/sysinit.target.wants/systemd-firstboot.service
 
 	# Do not ship distro-specific files (nsswitch.conf pam.d)
 	rm -rf "${D}"/usr/share/factory