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

[Dave Reisner]

    Date: Thursday, August 21, 2014 @ 00:31:36
  Author: dreisner
Revision: 220485

upgpkg: systemd 216-1

- reenable systemd-coredump (FS#41167)
- use systemd-firstboot to generate the machine ID (FS#40131)
- add polkit to optdepends (FS#41253)
- run systemd-sysusers on post_upgrade/post_install
- always run systemd-tmpfiles on post_upgrade

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

-----------------+
 PKGBUILD        |   26 ++++++++------------------
 systemd.install |   13 ++++++++++---
 2 files changed, 18 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-20 22:25:38 UTC (rev 220484)
+++ PKGBUILD	2014-08-20 22:31:36 UTC (rev 220485)
@@ -3,8 +3,8 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
-pkgver=215
-pkgrel=4
+pkgver=216
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -15,20 +15,12 @@
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-hook-udev'
         'initcpio-install-systemd'
-        'initcpio-install-udev'
-        '0001-networkd-properly-track-addresses-when-first-added.patch')
-md5sums=('d2603e9fffd8b18d242543e36f2e7d31'
+        'initcpio-install-udev')
+md5sums=('04fda588a04f549da0f397dce3ae6a39'
          '29245f7a240bfba66e2b1783b63b6b40'
          '66cca7318e13eaf37c5b7db2efa69846'
-         'bde43090d4ac0ef048e3eaee8202a407'
-         '2d237a277a12b3801c88d159d64a7413')
+         'bde43090d4ac0ef048e3eaee8202a407')
 
-prepare() {
-  cd "$pkgname-$pkgver"
-
-  patch -Np1 <"$srcdir"/0001-networkd-properly-track-addresses-when-first-added.patch
-}
-
 build() {
   cd "$pkgname-$pkgver"
 
@@ -61,7 +53,8 @@
               'cryptsetup: required for encrypted block devices'
               'libmicrohttpd: remote journald capabilities'
               'quota-tools: kernel-level quota management'
-              'systemd-sysvcompat: symlink package to provide sysvinit binaries')
+              'systemd-sysvcompat: symlink package to provide sysvinit binaries'
+              'polkit: allow administration as unprivileged user')
   backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
           etc/dbus-1/system.d/org.freedesktop.hostname1.conf
           etc/dbus-1/system.d/org.freedesktop.login1.conf
@@ -86,14 +79,11 @@
   rm "$pkgdir/etc/systemd/system/getty.target.wants/getty at tty1.service" \
       "$pkgdir/etc/systemd/system/multi-user.target.wants/systemd-networkd.service" \
       "$pkgdir/etc/systemd/system/multi-user.target.wants/systemd-resolved.service" \
-      "$pkgdir/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service" \
+      "$pkgdir/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service" \
       "$pkgdir/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service"
   rmdir "$pkgdir/etc/systemd/system/getty.target.wants" \
       "$pkgdir/etc/systemd/system/network-online.target.wants"
 
-  # remove the coredump rule until minidumps are a thing.
-  rm "$pkgdir/usr/lib/sysctl.d/50-coredump.conf"
-
   # get rid of RPM macros
   rm -r "$pkgdir/usr/lib/rpm"
 

Modified: systemd.install
===================================================================
--- systemd.install	2014-08-20 22:25:38 UTC (rev 220484)
+++ systemd.install	2014-08-20 22:31:36 UTC (rev 220485)
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 sd_booted() {
-  [[ -d run/systemd/system ]]
+  [[ -d run/systemd/system && ! -L run/systemd/system ]]
 }
 
 add_privs() {
@@ -36,8 +36,8 @@
 }
 
 post_common() {
-  systemd-machine-id-setup
-
+  systemd-sysusers
+  systemd-tmpfiles --create
   udevadm hwdb --update
   journalctl --update-catalog
 }
@@ -142,7 +142,14 @@
   systemd-tmpfiles --create etc.conf
 }
 
+_216_1_changes() {
+  echo ':: Coredumps are handled by systemd by default. Collection behavior can be'
+  echo '   tuned in /etc/systemd/coredump.conf.'
+}
+
 post_install() {
+  systemd-firstboot --setup-machine-id
+
   post_common "$@"
 
   add_journal_acls