diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-11 11:14:03 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-11 11:14:03 -0300 |
| commit | 828f6a7c0f0285abf2b1fb91895406dcb5d5b0e5 (patch) | |
| tree | fb283e1b49ba0e6a1fbb3748cc6600facf62fdc4 /community/systemd | |
| parent | 015d5bbcdc8bd4c24cd79582d13225844045d2ec (diff) | |
| parent | e81c6fe4fb38144709923b2da3ab68a01712a26b (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/flac/PKGBUILD
extra/glib/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/qiv/PKGBUILD
extra/vamp-plugin-sdk/PKGBUILD
extra/vcdimager/PKGBUILD
extra/xorg-server/PKGBUILD
Diffstat (limited to 'community/systemd')
| -rw-r--r-- | community/systemd/PKGBUILD | 6 | ||||
| -rw-r--r-- | community/systemd/systemd.install | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD index 7548d09b7..1e156047d 100644 --- a/community/systemd/PKGBUILD +++ b/community/systemd/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 53341 2011-08-03 04:06:06Z dreisner $ +# $Id: PKGBUILD 53877 2011-08-09 02:05:40Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=systemd pkgver=33 -pkgrel=1 +pkgrel=2 pkgdesc="Session and Startup manager" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2') -depends=('dbus-core' 'libcap' 'util-linux>=2.19' 'udev>=172') +depends=('dbus-core' 'kbd' 'libcap' 'util-linux>=2.19' 'udev>=172') makedepends=('docbook-xsl' 'libxslt' 'cryptsetup' 'gtk2' 'intltool' 'libnotify' 'gperf') optdepends=('cryptsetup: required for encrypted block devices' 'dbus-python: systemd-analyze' diff --git a/community/systemd/systemd.install b/community/systemd/systemd.install index 34f902276..04b29688a 100644 --- a/community/systemd/systemd.install +++ b/community/systemd/systemd.install @@ -1,7 +1,7 @@ #!/bin/sh checkgroups() { - if usr/bin/getent group lock >/dev/null; then + if ! usr/bin/getent group lock >/dev/null; then usr/sbin/groupadd -g 54 lock fi } @@ -13,7 +13,7 @@ sd_booted() { post_install() { checkgroups - if [ -f etc/machine-id ]; then + if [ ! -f etc/machine-id ]; then bin/systemd-machine-id-setup fi @@ -24,7 +24,7 @@ post_install() { post_upgrade() { checkgroups - if [ -f etc/machine-id ]; then + if [ ! -f etc/machine-id ]; then bin/systemd-machine-id-setup fi @@ -45,7 +45,9 @@ post_upgrade() { } post_remove() { - usr/bin/getent group lock >/dev/null && usr/sbin/groupdel lock + if usr/bin/getent group lock >/dev/null; then + usr/sbin/groupdel lock + fi } # vim:set ts=2 sw=2 et: |