[arch-commits] Commit in systemd/trunk (PKGBUILD systemd.install)

[Dave Reisner]

    Date: Friday, October 7, 2016 @ 17:48:26
  Author: dreisner
Revision: 277882

upgpkg: systemd 231-4

- avoid reexec when upgrading from 231-1 (FS#51275)

Modified:
  systemd/trunk/PKGBUILD
  systemd/trunk/systemd.install

-----------------+
 PKGBUILD        |    3 ++-
 systemd.install |   12 +++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-07 17:45:28 UTC (rev 277881)
+++ PKGBUILD	2016-10-07 17:48:26 UTC (rev 277882)
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
 pkgver=231
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -34,6 +34,7 @@
   '8523bf7dd514a3a2c6114b7b8fb8f308b4f09fc4'  # pid1: process zero-length notification messages again
   '9987750e7a4c62e0eb8473603150596ba7c3a015'  # pid1: don't return any error in manager_dispatch_notify_fd()
   'bd64d82c1c0e3fe2a5f9b3dd9132d62834f50b2d'  # Revert "pid1: reconnect to the console before being re-executed"
+  'bd5b9f0a12dd9c1947b11534e99c395ddf44caa9'  # systemctl: suppress errors with "show" for nonexistent units and properties
 )
 
 prepare() {

Modified: systemd.install
===================================================================
--- systemd.install	2016-10-07 17:45:28 UTC (rev 277881)
+++ systemd.install	2016-10-07 17:48:26 UTC (rev 277882)
@@ -10,12 +10,6 @@
   :
 }
 
-maybe_reexec() {
-  if sd_booted; then
-    systemctl --system daemon-reexec
-  fi
-}
-
 post_common() {
   systemd-sysusers
   journalctl --update-catalog
@@ -63,7 +57,11 @@
 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