sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

systemd: update install-quotaon-once.patch 

This patch has been merged upstream now, so refresh the patch with a backport
(the patch was changed before being merged).

(From OE-Core rev: cdad18589d08fdf592a50685f3b5fed32f4f4c76)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton 2013-06-14 12:23:46 +01:00 committed by Richard Purdie
parent 04af378874
commit 23fd4d2a09
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
meta/recipes-core/systemd/systemd/install-quotaon-once.patch
View File

@ -1,7 +1,7 @@
Upstream-Status: Submitted (https://bugs.freedesktop.org/show_bug.cgi?id=65659)
Upstream-Status: Backport
Signed-off-by: Ross Burton <ross.burton@intel.com>
From 44b7c4dc877984b5ea3f2c9fa09a93ee16dbe3b2 Mon Sep 17 00:00:00 2001
From 622004565eca385c685086cd478aa79afe73b785 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Tue, 11 Jun 2013 17:16:37 +0100
Subject: [PATCH] build-sys: don't install quotaon.service twice
@ -9,24 +9,26 @@ Subject: [PATCH] build-sys: don't install quotaon.service twice
quotaon.service is already installed through dist_systemunit_DATA, so it doesn't
need to be added to nodist_systemunit_DATA. Installing the same file twice
results in a race condition where the install process can fail.
https://bugs.freedesktop.org/show_bug.cgi?id=65659
[zj: actually remove quotaon.service from the other list.]
---
Makefile.am | 3 ---
1 file changed, 3 deletions(-)
Makefile.am | 1 -
1 file changed, 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 28ae7ed..197119e 100644
index 3a196a6..d444eac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3229,9 +3229,6 @@ endif
EXTRA_DIST += \
units/systemd-quotacheck.service.in
-nodist_systemunit_DATA += \
- units/quotaon.service
-
# ------------------------------------------------------------------------------
if ENABLE_RANDOMSEED
rootlibexec_PROGRAMS += \
@@ -401,7 +401,6 @@ dist_systemunit_DATA = \
units/bluetooth.target \
units/smartcard.target \
units/systemd-tmpfiles-clean.timer \
- units/quotaon.service \
units/systemd-ask-password-wall.path \
units/systemd-ask-password-console.path \
units/systemd-udevd-control.socket \
--
1.7.10.4