diff options
Diffstat (limited to 'testing/systemd')
| -rw-r--r-- | testing/systemd/PKGBUILD | 7 | ||||
| -rw-r--r-- | testing/systemd/systemd.install | 20 |
2 files changed, 11 insertions, 16 deletions
diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD index 2655255a1..3b08e11a8 100644 --- a/testing/systemd/PKGBUILD +++ b/testing/systemd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 157518 2012-04-28 21:41:17Z dreisner $ +# $Id: PKGBUILD 158121 2012-05-03 02:49:53Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgbase=systemd pkgname=('systemd' 'libsystemd') pkgver=44 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -76,9 +76,8 @@ package_systemd() { chmod 644 "$pkgdir/usr/lib/tmpfiles.d/console.conf" # symlink to /bin/systemd for compat and sanity - install -dm755 "$pkgdir/bin" "$pkgdir/lib/systemd" + install -dm755 "$pkgdir/bin" ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd" - ln -s ../../usr/lib/systemd/systemd "$pkgdir/lib/systemd/systemd" # use python2 for systemd-analyze sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" diff --git a/testing/systemd/systemd.install b/testing/systemd/systemd.install index 822108c0f..0c3e9abee 100644 --- a/testing/systemd/systemd.install +++ b/testing/systemd/systemd.install @@ -29,18 +29,14 @@ post_upgrade() { fi if sd_booted; then - systemctl daemon-reload - systemctl daemon-reexec - fi - - newpkgver=${1%-*} - oldpkgver=${2%-*} - - # catch v31 need for restarting systemd-logind.service - if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then - # but only if systemd is running - if sd_booted; then - systemctl try-restart systemd-logind.service + # we moved the binary in 44-2 to /usr, so a reexec leads to a + # coredump. refuse this reexec and warn the user that they should + # reboot instead. + if [ "$(vercmp 44-2 "$2")" -eq 1 ]; then + echo "warning: refusing to reexec systemd. the system should be rebooted." + else + systemctl daemon-reload + systemctl daemon-reexec fi fi } |