[arch-commits] Commit in systemd/trunk (PKGBUILD systemd.install)

Dave Reisner dreisner at archlinux.org
Sun Jan 15 17:04:30 UTC 2012


    Date: Sunday, January 15, 2012 @ 12:04:30
  Author: dreisner
Revision: 146660

upgpkg: systemd 38-3

- revert removal of --with-rootlibdir

Modified:
  systemd/trunk/PKGBUILD
  systemd/trunk/systemd.install

-----------------+
 PKGBUILD        |    5 +++--
 systemd.install |   16 ++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-15 16:26:31 UTC (rev 146659)
+++ PKGBUILD	2012-01-15 17:04:30 UTC (rev 146660)
@@ -3,7 +3,7 @@
 
 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 @@
               --libexecdir=/usr/lib \
               --libdir=/usr/lib \
               --localstatedir=/var \
-              --with-rootprefix=
+              --with-rootprefix= \
+              --with-rootlibdir=/lib
 
   make
 

Modified: systemd.install
===================================================================
--- systemd.install	2012-01-15 16:26:31 UTC (rev 146659)
+++ systemd.install	2012-01-15 17:04:30 UTC (rev 146660)
@@ -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 @@
   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 @@
   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 @@
   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
 }
 




More information about the arch-commits mailing list