summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-10-12 01:21:26 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-10-12 01:22:52 -0300
commita4558e7326c5e814d0e17d6b76f1d8f3b63d8950 (patch)
treee34ce76781011ef3ad2fcbdc64f194ec703a98a2 /libre
parente923e0eacc2450cdd36efefae84e195cc5e4cfe8 (diff)
downloadabslibre-a4558e7326c5e814d0e17d6b76f1d8f3b63d8950.tar.gz
abslibre-a4558e7326c5e814d0e17d6b76f1d8f3b63d8950.tar.bz2
abslibre-a4558e7326c5e814d0e17d6b76f1d8f3b63d8950.zip
systemd-231-4.parabola1: avoid reexec when upgrading from 231-1.parabola1 - FS#51275 -> https://bugs.archlinux.org/task/51275
Diffstat (limited to 'libre')
-rw-r--r--libre/systemd/PKGBUILD3
-rw-r--r--libre/systemd/systemd.install12
2 files changed, 7 insertions, 8 deletions
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
index 2fb205a2c..4309d7cad 100644
--- a/libre/systemd/PKGBUILD
+++ b/libre/systemd/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=systemd
pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat'
'libsystemd-standalone' 'libudev' 'nss-myhostname' 'nss-mymachines' 'nss-resolve')
pkgver=231
-pkgrel=3.parabola1
+pkgrel=4.parabola1
arch=('i686' 'x86_64' 'armv7h')
url="http://www.freedesktop.org/wiki/Software/systemd"
makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -53,6 +53,7 @@ _backports=(
'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() {
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