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

[Dave Reisner]

    Date: Tuesday, December 24, 2013 @ 21:57:53
  Author: dreisner
Revision: 202688

upgpkg: systemd 208-8

- add /var/log/journal ACLs at install (and one time post_upgrade)
- keep sd_booted install scriptlet definition in line with upstream
- backport trivial fix for remote FS ordering from /proc/self/mountinfo

Added:
  systemd/trunk/0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch
Modified:
  systemd/trunk/PKGBUILD
  systemd/trunk/systemd.install

-----------------------------------------------------------------+
 0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch |   41 ++++++++++
 PKGBUILD                                                        |    6 +
 systemd.install                                                 |   16 +++
 3 files changed, 61 insertions(+), 2 deletions(-)

Added: 0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch
===================================================================
--- 0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch	                        (rev 0)
+++ 0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch	2013-12-24 20:57:53 UTC (rev 202688)
@@ -0,0 +1,41 @@
+From 77009452cfd25208509b14ea985e81fdf9f7d40e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
+Date: Thu, 3 Oct 2013 22:15:08 -0400
+Subject: [PATCH] systemd: order remote mounts from mountinfo before
+ remote-fs.target
+
+Usually the network is stopped before filesystems are umounted.
+Ordering network filesystems before remote-fs.target means that their
+unmounting will be performed earlier, and can terminate sucessfully.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=70002
+---
+ src/core/mount.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/mount.c b/src/core/mount.c
+index 3d46557..93bfa99 100644
+--- a/src/core/mount.c
++++ b/src/core/mount.c
+@@ -1440,6 +1440,9 @@ static int mount_add_one(
+ 
+         u = manager_get_unit(m, e);
+         if (!u) {
++                const char* const target =
++                        fstype_is_network(fstype) ? SPECIAL_REMOTE_FS_TARGET : SPECIAL_LOCAL_FS_TARGET;
++
+                 delete = true;
+ 
+                 u = unit_new(m, sizeof(Mount));
+@@ -1466,7 +1469,7 @@ static int mount_add_one(
+                         goto fail;
+                 }
+ 
+-                r = unit_add_dependency_by_name(u, UNIT_BEFORE, SPECIAL_LOCAL_FS_TARGET, NULL, true);
++                r = unit_add_dependency_by_name(u, UNIT_BEFORE, target, NULL, true);
+                 if (r < 0)
+                         goto fail;
+ 
+-- 
+1.8.5.2
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-24 18:48:56 UTC (rev 202687)
+++ PKGBUILD	2013-12-24 20:57:53 UTC (rev 202688)
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
 pkgver=208
-pkgrel=7
+pkgrel=8
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -15,6 +15,7 @@
         'initcpio-hook-udev'
         'initcpio-install-systemd'
         'initcpio-install-udev'
+        '0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch'
         '0001-Make-hibernation-test-work-for-swap-files.patch'
         '0001-fix-lingering-references-to-var-lib-backlight-random.patch'
         '0001-mount-check-for-NULL-before-reading-pm-what.patch'
@@ -32,6 +33,7 @@
          '29245f7a240bfba66e2b1783b63b6b40'
          '8b68b0218a3897d4d37a6ccf47914774'
          'bde43090d4ac0ef048e3eaee8202a407'
+         '8f1182afa1156f0076a912b23e761e02'
          'a5c6564d5435ee99814effd2aa9baf93'
          '1b191c4e7a209d322675fd199e3abc66'
          'a693bef63548163ffc165f4c4801ebf7'
@@ -68,6 +70,8 @@
   patch -Np1 < "$srcdir"/0001-fstab-generator-Do-not-try-to-fsck-non-devices.patch
   # Fix FS#38123
   patch -Np1 < "$srcdir"/0001-Make-hibernation-test-work-for-swap-files.patch
+  # Fix FS#35671
+  patch -Np1 <"$srcdir"/0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch
 
   autoreconf
 }

Modified: systemd.install
===================================================================
--- systemd.install	2013-12-24 18:48:56 UTC (rev 202687)
+++ systemd.install	2013-12-24 20:57:53 UTC (rev 202688)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 sd_booted() {
-  [ -e sys/fs/cgroup/systemd ]
+  [[ -d /run/systemd/systemd/ ]]
 }
 
 add_privs() {
@@ -11,6 +11,14 @@
   fi
 }
 
+add_journal_acls() {
+  # ignore errors, since the filesystem might not support ACLs
+  {
+    setfacl -nm g:adm:rx,d:g:adm:rx var/log/journal
+    setfacl -nm g:wheel:rx,d:g:wheel:rx var/log/journal
+  } 2>/dev/null
+}
+
 post_common() {
   systemd-machine-id-setup
 
@@ -54,6 +62,8 @@
 post_install() {
   post_common
 
+  add_journal_acls
+
   # enable getty at tty1 by default, but don't track the file
   systemctl enable getty at tty1.service
 
@@ -115,6 +125,10 @@
   if [ "$(vercmp 208-1 "$2")" -eq 1 ]; then
     _208_changes
   fi
+
+  if [ "$(vercmp 208-8 "$2")" -eq 1 ]; then
+    add_journal_acls
+  fi
 }
 
 # vim:set ts=2 sw=2 et: