diff options
| author | root <root@rshg054.dnsready.net> | 2012-10-01 00:42:10 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-10-01 00:42:10 -0700 |
| commit | 9b6be78b0c13a61c14d5278f1363eaf9c6388e4c (patch) | |
| tree | 72ca5c2f4a99c399cee5fe08d77d5fc33ab94e56 /core/systemd | |
| parent | 75826a796a4589c1999f1b3b86eb8c122ef44edd (diff) | |
Mon Oct 1 00:42:09 PDT 2012
Diffstat (limited to 'core/systemd')
| -rw-r--r-- | core/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch | 30 | ||||
| -rw-r--r-- | core/systemd/PKGBUILD | 9 |
2 files changed, 37 insertions, 2 deletions
diff --git a/core/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch b/core/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch new file mode 100644 index 000000000..9be6ef28f --- /dev/null +++ b/core/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch @@ -0,0 +1,30 @@ +From 1845fdd967d3a4c06f895413505de3c2429955b0 Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreisner@archlinux.org> +Date: Thu, 27 Sep 2012 20:48:13 -0400 +Subject: [PATCH] tmpfiles: restore previous behavior for F/f + +d4e9eb91ea changed the behavior for the F and f actions, wrongly sending +them to glob_item(). Restore the old behavior and shortcut straight to +write_one_file(). +--- + src/tmpfiles/tmpfiles.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c +index f10f908..bf900fa 100644 +--- a/src/tmpfiles/tmpfiles.c ++++ b/src/tmpfiles/tmpfiles.c +@@ -673,6 +673,10 @@ static int create_item(Item *i) { + + case CREATE_FILE: + case TRUNCATE_FILE: ++ r = write_one_file(i, i->path); ++ if (r < 0) ++ return r; ++ break; + case WRITE_FILE: + r = glob_item(i, write_one_file); + if (r < 0) +-- +1.7.12.1 + diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 5e0421849..8dc086a4a 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') -pkgver=192 +pkgver=193 pkgrel=1 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" @@ -18,12 +18,14 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-install-udev' 'initcpio-install-timestamp' '0001-Reinstate-TIMEOUT-handling.patch' + '0001-tmpfiles-restore-previous-behavior-for-F-f.patch' 'use-split-usr-path.patch') -md5sums=('e8692055923e87f7f9cb634d44314edb' +md5sums=('732a9de2b1d2a15cab639c987ff9e90e' 'e99e9189aa2f6084ac28b8ddf605aeb8' '59e91c4d7a69b7bf12c86a9982e37ced' 'df69615503ad293c9ddf9d8b7755282d' '5543be25f205f853a21fa5ee68e03f0d' + '1f435290db227c3a4f4396f86819227e' 'fd5b5f04ab0a847373d357555129d4c0') build() { @@ -35,6 +37,9 @@ build() { # hang onto this until we do the /{,s}bin merge patch -Np1 <"$srcdir/use-split-usr-path.patch" + # upstream commit 1845fdd967d3a4c06f895413505de3c2429955b0 + patch -Np1 <"$srcdir/0001-tmpfiles-restore-previous-behavior-for-F-f.patch" + ./configure \ --libexecdir=/usr/lib \ --localstatedir=/var \ |