From e96f6ac6e912185a495a99af2b0d51b73bd1d044 Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Fri, 17 Jun 2011 23:02:42 +0000
Subject: Fri Jun 17 23:02:42 UTC 2011

---
 community/systemd/PKGBUILD        | 13 +++++--------
 community/systemd/systemd.install | 10 +++++-----
 2 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'community/systemd')

diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD
index 0016127b2..0efa9c6d0 100644
--- a/community/systemd/PKGBUILD
+++ b/community/systemd/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 47976 2011-05-26 18:14:34Z dreisner $
+# $Id: PKGBUILD 49447 2011-06-16 13:09:25Z dreisner $
 # Maintainer: Dave Reisner <d@falconindy.com>
 
 pkgname=systemd
-pkgver=28
+pkgver=29
 pkgrel=1
 pkgdesc="Session and Startup manager"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2')
-depends=('dbus-core' 'initscripts' 'sysvinit' 'util-linux>=2.19')
+depends=('dbus-core' 'sysvinit' 'util-linux>=2.19')
 makedepends=('docbook-xsl' 'libxslt' 'cryptsetup' 'gtk2' 'libnotify')
 optdepends=('cryptsetup: required for encrypted block devices'
             'dbus-python: systemd-analyze'
             'gtk2: systemadm'
+            'initscripts: legacy support for hostname and vconsole setup'
             'initscripts-systemd: native boot and initialization scripts'
             'libnotify: systemadm'
             'python2-cairo: systemd-analyze'
@@ -27,7 +28,7 @@ backup=(etc/systemd/system.conf
 install=systemd.install
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2"
         "os-release")
-md5sums=('be37500f576a0494f82fed7fa47cc306'
+md5sums=('e91ffd208c5f03e5c11966eee7b684b0'
          '752636def0db3c03f121f8b4f44a63cd')
 
 build() {
@@ -50,15 +51,11 @@ package() {
   make DESTDIR="$pkgdir" install
 
   install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
-  install -dm755 "$pkgdir/etc/modules-load.d"
   printf "d /run/console 755 root root\n" > "$pkgdir/etc/tmpfiles.d/console.conf"
 
   # fix systemd-analyze for python2
   sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
 
-  # install target doesn't bring in plymouth units
-  install -m644 units/plymouth-* "$pkgdir/lib/systemd/system"
-
   # rename man pages to avoid conflicts with sysvinit
   cd "$pkgdir/usr/share/man/man8"
   for manpage in telinit halt reboot poweroff runlevel shutdown; do
diff --git a/community/systemd/systemd.install b/community/systemd/systemd.install
index 33d597bf1..7ec58682a 100644
--- a/community/systemd/systemd.install
+++ b/community/systemd/systemd.install
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 checkgroups() {
   getent group lock >/dev/null || groupadd -g 54 lock
@@ -7,7 +7,7 @@ checkgroups() {
 post_install() {
   checkgroups
 
-  [ -f /etc/machine-id ] || /bin/systemd-machine-id-setup
+  [ -f /etc/machine-id ] || systemd-machine-id-setup
 
   echo "systemd has been installed to /bin/systemd. Please ensure you append"
   echo "init=/bin/systemd to your kernel command line in your bootloader."
@@ -16,12 +16,12 @@ post_install() {
 post_upgrade() {
   checkgroups
 
-  [ -f /etc/machine-id ] || /bin/systemd-machine-id-setup
-  /bin/systemctl daemon-reexec >/dev/null || :
+  [ -f /etc/machine-id ] || systemd-machine-id-setup
+  systemctl daemon-reexec >/dev/null || :
 }
 
 pre_remove() {
-  /bin/rm -f /etc/systemd/system/default.target
+  rm -f /etc/systemd/system/default.target
 }
 
 post_remove() {
-- 
cgit v1.2.3-54-g00ecf