From 08a16f35d70b750b4db213a4bfcbacf5b3be4d74 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 16 Jan 2012 23:15:11 +0000 Subject: Mon Jan 16 23:15:10 UTC 2012 --- testing/systemd/PKGBUILD | 7 ++++--- testing/systemd/systemd.install | 16 ++++++++-------- 2 files changed, 12 insertions(+), 11 deletions(-) (limited to 'testing/systemd') diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD index 1dea4b12a..f1cfcbd5f 100644 --- a/testing/systemd/PKGBUILD +++ b/testing/systemd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146631 2012-01-14 21:33:48Z dreisner $ +# $Id: PKGBUILD 146660 2012-01-15 17:04:30Z dreisner $ # Maintainer: Dave Reisner pkgname=systemd pkgver=38 -pkgrel=2 +pkgrel=3 pkgdesc="Session and Startup manager" arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" @@ -51,7 +51,8 @@ build() { --libexecdir=/usr/lib \ --libdir=/usr/lib \ --localstatedir=/var \ - --with-rootprefix= + --with-rootprefix= \ + --with-rootlibdir=/lib make diff --git a/testing/systemd/systemd.install b/testing/systemd/systemd.install index 04b29688a..4850c879e 100644 --- a/testing/systemd/systemd.install +++ b/testing/systemd/systemd.install @@ -1,8 +1,8 @@ #!/bin/sh checkgroups() { - if ! usr/bin/getent group lock >/dev/null; then - usr/sbin/groupadd -g 54 lock + if ! getent group lock >/dev/null; then + sbin/groupadd -g 54 lock fi } @@ -14,7 +14,7 @@ post_install() { checkgroups if [ ! -f etc/machine-id ]; then - bin/systemd-machine-id-setup + systemd-machine-id-setup fi echo "systemd has been installed to /bin/systemd. Please ensure you append" @@ -25,11 +25,11 @@ post_upgrade() { checkgroups if [ ! -f etc/machine-id ]; then - bin/systemd-machine-id-setup + systemd-machine-id-setup fi if sd_booted; then - bin/systemctl daemon-reexec >/dev/null + systemctl daemon-reexec >/dev/null fi newpkgver=${1%-*} @@ -39,14 +39,14 @@ post_upgrade() { if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then # but only if systemd is running if sd_booted; then - bin/systemctl try-restart systemd-logind.service + systemctl try-restart systemd-logind.service fi fi } post_remove() { - if usr/bin/getent group lock >/dev/null; then - usr/sbin/groupdel lock + if getent group lock >/dev/null; then + groupdel lock fi } -- cgit v1.2.3-54-g00ecf