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

Dave Reisner dreisner at archlinux.org
Tue May 29 15:20:42 UTC 2012


    Date: Tuesday, May 29, 2012 @ 11:20:42
  Author: dreisner
Revision: 160062

upgpkg: systemd 183-5

- kill off unneeded lock directories (FS#30054)
- remove creation of lock user

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-29 14:41:20 UTC (rev 160061)
+++ PKGBUILD	2012-05-29 15:20:42 UTC (rev 160062)
@@ -3,7 +3,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-tools')
 pkgver=183
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2' 'LGPL2.1' 'MIT')
@@ -191,6 +191,9 @@
           s#GROUP="tape"#GROUP="storage"#g;
           s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules
 
+  # get rid of unneded lock directories
+  sed -ri '/\/run\/lock\/(subsys|lockdev)/d' "$pkgdir"/usr/lib/tmpfiles.d/legacy.conf
+
   # add mkinitcpio hooks
   install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev"
   install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev"

Modified: systemd.install
===================================================================
--- systemd.install	2012-05-29 14:41:20 UTC (rev 160061)
+++ systemd.install	2012-05-29 15:20:42 UTC (rev 160062)
@@ -1,18 +1,10 @@
 #!/bin/sh
 
-checkgroups() {
-  if ! getent group lock >/dev/null; then
-    groupadd -g 54 lock
-  fi
-}
-
 sd_booted() {
   [ -e sys/fs/cgroup/systemd ]
 }
 
 post_install() {
-  checkgroups
-
   if [ ! -f etc/machine-id ]; then
     systemd-machine-id-setup
   fi
@@ -25,8 +17,6 @@
 }
 
 post_upgrade() {
-  checkgroups
-
   if [ ! -f etc/machine-id ]; then
     systemd-machine-id-setup
   fi




More information about the arch-commits mailing list