From a4558e7326c5e814d0e17d6b76f1d8f3b63d8950 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Wed, 12 Oct 2016 01:21:26 -0300
Subject: systemd-231-4.parabola1: avoid reexec when upgrading from
 231-1.parabola1 - FS#51275 -> https://bugs.archlinux.org/task/51275

---
 libre/systemd/systemd.install | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'libre/systemd/systemd.install')

diff --git a/libre/systemd/systemd.install b/libre/systemd/systemd.install
index f2978d973..b59de2008 100644
--- a/libre/systemd/systemd.install
+++ b/libre/systemd/systemd.install
@@ -10,12 +10,6 @@ add_journal_acls() {
   :
 }
 
-maybe_reexec() {
-  if sd_booted; then
-    systemctl --system daemon-reexec
-  fi
-}
-
 post_common() {
   systemd-sysusers
   journalctl --update-catalog
@@ -63,7 +57,11 @@ post_install() {
 post_upgrade() {
   post_common "$@"
 
-  maybe_reexec "$@"
+  # don't reexec if the old version is 231-1 or 231-2.
+  # https://github.com/systemd/systemd/commit/bd64d82c1c
+  if [[ $1 != 231-[12] ]] && sd_booted; then
+    systemctl --system daemon-reexec
+  fi
 
   local v upgrades=(
     216-2
-- 
cgit v1.2.3