[gentoo-commits] dev/mgorny:master commit in: sys-apps/systemd/, sys-apps/systemd/files/

[Michał Górny]

commit:     339601a030c05fb9e8e2f873b05c11cc73c0d9bb
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 09:49:49 2012 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 09:49:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=339601a0

sys-apps/systemd: Migrate to /usr.

(Portage version: 2.2.0_alpha84/git/Linux x86_64, unsigned Manifest commit)

---
 .../systemd/files/update-etc-systemd-symlinks.path |    5 +++
 .../files/update-etc-systemd-symlinks.service      |    6 ++++
 .../systemd/files/update-etc-systemd-symlinks.sh   |   19 +++++++++++++
 sys-apps/systemd/systemd-9999.ebuild               |   28 ++++++++++++++++++-
 4 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/sys-apps/systemd/files/update-etc-systemd-symlinks.path b/sys-apps/systemd/files/update-etc-systemd-symlinks.path
new file mode 100644
index 0000000..33a9576
--- /dev/null
+++ b/sys-apps/systemd/files/update-etc-systemd-symlinks.path
@@ -0,0 +1,5 @@
+[Unit]
+Description=Update /etc/systemd/system symlinks for units moved to /usr
+
+[Path]
+PathChanged=/lib/systemd/system

diff --git a/sys-apps/systemd/files/update-etc-systemd-symlinks.service b/sys-apps/systemd/files/update-etc-systemd-symlinks.service
new file mode 100644
index 0000000..c05a194
--- /dev/null
+++ b/sys-apps/systemd/files/update-etc-systemd-symlinks.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=Update /etc/systemd/system symlinks for units moved to /usr
+
+[Service]
+Type=oneshot
+ExecStart=/usr/libexec/systemd/update-etc-systemd-symlinks.sh

diff --git a/sys-apps/systemd/files/update-etc-systemd-symlinks.sh b/sys-apps/systemd/files/update-etc-systemd-symlinks.sh
new file mode 100755
index 0000000..ce81bba
--- /dev/null
+++ b/sys-apps/systemd/files/update-etc-systemd-symlinks.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+# Update symlinks to systemd units moved into /usr/systemd.
+# (c) 2012 Michał Górny
+# Released under the terms of the 2-clause BSD license
+
+IFS_SAVE=${IFS}
+IFS='
+'
+# follow + symlink type will match broken symlinks only
+set -- $(find -L /etc/systemd/system -type l -print)
+IFS=${IFS_SAVE}
+
+for f; do
+	old_path=$(readlink "${f}")
+	new_path=/usr/lib${old_path#/lib}
+	if [ -f "${new_path}" ]; then
+		ln -v -s -f "${new_path}" "${f}"
+	fi
+done

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index da2e400..c13decc 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -77,14 +77,18 @@ pkg_setup() {
 src_prepare() {
 	# Force the rebuild of .vala sources
 	touch src/*.vala || die
+
+	# Fix hardcoded path in .vala.
+	sed -i -e 's:/lib/systemd:/usr/lib/systemd:g' src/*.vala || die
+
 	autotools-utils_src_prepare
 }
 
 src_configure() {
 	local myeconfargs=(
 		--with-distro=gentoo
-		--with-rootprefix=
-		--with-rootlibdir=/$(get_libdir)
+		--with-rootprefix=/usr
+		--with-rootlibdir=/usr/$(get_libdir)
 		--localstatedir=/var
 		--docdir=/tmp/docs
 		$(use_enable acl)
@@ -108,6 +112,9 @@ src_install() {
 	autotools-utils_src_install \
 		bashcompletiondir=/tmp
 
+	# compat for init= use
+	dosym ../usr/bin/systemd /bin/systemd
+
 	# move files as necessary
 	newbashcomp "${D}"/tmp/systemd-bash-completion.sh ${PN}
 	dodoc "${D}"/tmp/docs/*
@@ -122,6 +129,12 @@ src_install() {
 	# Create /run/lock as required by new baselay/OpenRC compat.
 	insinto /usr/lib/tmpfiles.d
 	doins "${FILESDIR}"/gentoo-run.conf
+
+	# Migration helpers.
+	exeinto /usr/libexec/systemd
+	doexe "${FILESDIR}"/update-etc-systemd-symlinks.sh
+	systemd_dounit "${FILESDIR}"/update-etc-systemd-symlinks.{service,path}
+	systemd_enable_service sysinit.target update-etc-systemd-symlinks.path
 }
 
 pkg_preinst() {
@@ -160,4 +173,15 @@ pkg_postinst() {
 	ewarn "responsibility. Please remember than you can pass:"
 	ewarn "	init=/sbin/init"
 	ewarn "to your kernel to boot using sysvinit / OpenRC."
+
+	# Don't run it if we're outta /
+	if [[ ! ${ROOT%/} ]]; then
+		# Update symlinks to moved units.
+		sh "${FILESDIR}"/update-etc-systemd-symlinks.sh
+
+		# Try to start migration unit.
+		ebegin "Trying to start migration helper path monitoring."
+		systemctl --system start update-etc-systemd-symlinks.path 2>/dev/null
+		eend ${?}
+	fi
 }