[arch-commits] Commit in systemd/trunk (3 files)

[Dave Reisner]

    Date: Tuesday, June 3, 2014 @ 06:33:18
  Author: dreisner
Revision: 214047

upgpkg: systemd 213-4

- backport fix for networkd dir ownership
- re-enable systemd-resolved on upgrade if /etc/resolv.conf is a symlink

Added:
  systemd/trunk/0001-tmpfiles-systemd.conf-fix-ownership-of-network-direc.patch
Modified:
  systemd/trunk/PKGBUILD
  systemd/trunk/systemd.install

-----------------------------------------------------------------+
 0001-tmpfiles-systemd.conf-fix-ownership-of-network-direc.patch |   29 ++++++++++
 PKGBUILD                                                        |    9 ++-
 systemd.install                                                 |   15 ++++-
 3 files changed, 49 insertions(+), 4 deletions(-)

Added: 0001-tmpfiles-systemd.conf-fix-ownership-of-network-direc.patch
===================================================================
--- 0001-tmpfiles-systemd.conf-fix-ownership-of-network-direc.patch	                        (rev 0)
+++ 0001-tmpfiles-systemd.conf-fix-ownership-of-network-direc.patch	2014-06-03 04:33:18 UTC (rev 214047)
@@ -0,0 +1,29 @@
+From 01501939d5f608541c1ea98fe2da84d841f9c9bc Mon Sep 17 00:00:00 2001
+From: Tom Gundersen <teg at jklm.no>
+Date: Mon, 2 Jun 2014 15:05:05 +0200
+Subject: [PATCH] tmpfiles: systemd.conf - fix ownership of network directories
+
+---
+ tmpfiles.d/systemd.conf | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tmpfiles.d/systemd.conf b/tmpfiles.d/systemd.conf
+index 7efab0e..1fce514 100644
+--- a/tmpfiles.d/systemd.conf
++++ b/tmpfiles.d/systemd.conf
+@@ -21,9 +21,9 @@ d /run/systemd/sessions 0755 root root -
+ d /run/systemd/users 0755 root root -
+ d /run/systemd/machines 0755 root root -
+ d /run/systemd/shutdown 0755 root root -
+-d /run/systemd/network 0755 root root -
+-d /run/systemd/network/links 0755 root root -
+-d /run/systemd/network/leases 0755 root root -
++d /run/systemd/network 0755 systemd-network systemd-network -
++d /run/systemd/network/links 0755 systemd-network systemd-network -
++d /run/systemd/network/leases 0755 systemd-network systemd-network -
+ 
+ m /var/log/journal 2755 root systemd-journal - -
+ Z /var/log/journal/%m 2755 root systemd-journal - -
+-- 
+2.0.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-03 04:12:30 UTC (rev 214046)
+++ PKGBUILD	2014-06-03 04:33:18 UTC (rev 214047)
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
 pkgver=213
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -16,17 +16,20 @@
         'initcpio-hook-udev'
         'initcpio-install-systemd'
         'initcpio-install-udev'
-        '0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch')
+        '0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch'
+        '0001-tmpfiles-systemd.conf-fix-ownership-of-network-direc.patch')
 md5sums=('06496edcf86ddf6d8c12d72ba78e735d'
          '29245f7a240bfba66e2b1783b63b6b40'
          '66cca7318e13eaf37c5b7db2efa69846'
          'bde43090d4ac0ef048e3eaee8202a407'
-         '5f8ad7126970855614c7fa34b317728d')
+         '5f8ad7126970855614c7fa34b317728d'
+         'd778cbbe8adb9651979da58cfe1c2dde')
 
 prepare() {
   cd "$pkgname-$pkgver"
 
   patch -Np1 <"$srcdir/0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch"
+  patch -Np1 <"$srcdir/0001-tmpfiles-systemd.conf-fix-ownership-of-network-direc.patch"
 }
 
 build() {

Modified: systemd.install
===================================================================
--- systemd.install	2014-06-03 04:12:30 UTC (rev 214046)
+++ systemd.install	2014-06-03 04:33:18 UTC (rev 214047)
@@ -38,6 +38,8 @@
 post_common() {
   systemd-machine-id-setup
 
+  # TODO: drop this for 214
+  # http://cgit.freedesktop.org/systemd/systemd/commit/?id=fdd2531170
   add_privs usr/bin/systemd-detect-virt 'cap_dac_override,cap_sys_ptrace+ep'
 
   udevadm hwdb --update
@@ -111,6 +113,16 @@
   fi
 }
 
+_213_4_changes() {
+  if sd_booted; then
+    # if /etc/resolv.conf is a symlink, just assume that it was being managed
+    # by systemd-networkd, and re-enable systemd-resolved.
+    if [[ -L etc/resolv.conf ]]; then
+      systemctl enable systemd-resolved
+    fi
+  fi
+}
+
 post_install() {
   post_common "$@"
 
@@ -134,7 +146,8 @@
                     208-1
                     208-8
                     209-1
-                    210-1)
+                    210-1
+                    213-4)
 
   for v in "${upgrades[@]}"; do
     if [[ $(vercmp "$v" "$2") -eq 1 ]]; then