From: Mike Gilbert <floppym@gentoo.org>
Date: Thu, 27 Dec 2018 06:35:41 +0000 (-0500)
Subject: sys-apps/systemd: reexec in pkg_postinst
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ed1c7de237ae5d2aff784d9c7fcd4df7fb43a6d6;p=gentoo.git

sys-apps/systemd: reexec in pkg_postinst

Closes: https://bugs.gentoo.org/673778
Package-Manager: Portage-2.3.52_p18, Repoman-2.3.12_p30
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---

diff --git a/sys-apps/systemd/systemd-240.ebuild b/sys-apps/systemd/systemd-240.ebuild
index 000f34f01187..84248ba4f3a3 100644
--- a/sys-apps/systemd/systemd-240.ebuild
+++ b/sys-apps/systemd/systemd-240.ebuild
@@ -434,6 +434,12 @@ pkg_postinst() {
 
 	systemd_reenable systemd-networkd.service systemd-resolved.service
 
+	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
+		ebegin "Reexecuting system manager"
+		systemctl daemon-reexec || FAIL=1
+		eend $?
+	fi
+
 	if [[ ${FAIL} ]]; then
 		eerror "One of the postinst commands failed. Please check the postinst output"
 		eerror "for errors. You may need to clean up your system and/or try installing"
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 000f34f01187..84248ba4f3a3 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -434,6 +434,12 @@ pkg_postinst() {
 
 	systemd_reenable systemd-networkd.service systemd-resolved.service
 
+	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
+		ebegin "Reexecuting system manager"
+		systemctl daemon-reexec || FAIL=1
+		eend $?
+	fi
+
 	if [[ ${FAIL} ]]; then
 		eerror "One of the postinst commands failed. Please check the postinst output"
 		eerror "for errors. You may need to clean up your system and/or try installing"