core/systemd to 231-4

This commit is contained in:
Kevin Mihelich 2016-10-09 21:16:33 +00:00
parent df7067174a
commit 09608a1f08
2 changed files with 7 additions and 8 deletions

View file

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

View file

@ -10,12 +10,6 @@ add_journal_acls() {
: :
} }
maybe_reexec() {
if sd_booted; then
systemctl --system daemon-reexec
fi
}
post_common() { post_common() {
systemd-sysusers systemd-sysusers
journalctl --update-catalog journalctl --update-catalog
@ -63,7 +57,11 @@ post_install() {
post_upgrade() { post_upgrade() {
post_common "$@" 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=( local v upgrades=(
216-2 216-2