systemd: don't install quotaon.service twice

If the same file is installed twice there's a race which can lead to "make
install" failing.  Remove the redundant installation of quotaon.service to
eliminate the race.

(From OE-Core master rev: c6c5c2285e1b6cb3598ccba08aee3dfd090e7129)

(From OE-Core rev: 7b8dd3b5547b501e94a6887d3be5c2bbb8845ec8)

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-11 18:00:03 +01:00
committed by Richard Purdie
parent 0a697caca4
commit d58294d91e
2 changed files with 33 additions and 0 deletions

View File

@@ -0,0 +1,32 @@
Upstream-Status: Submitted (https://bugs.freedesktop.org/show_bug.cgi?id=65659)
Signed-off-by: Ross Burton <ross.burton@intel.com>
From 44b7c4dc877984b5ea3f2c9fa09a93ee16dbe3b2 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
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.
---
Makefile.am | 3 ---
1 file changed, 3 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 28ae7ed..197119e 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 += \
--
1.7.10.4

View File

@@ -23,6 +23,7 @@ SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
file://modprobe.rules \
file://var-run.conf \
${UCLIBCPATCHES} \
file://install-quotaon-once.patch \
file://00-create-volatile.conf \
file://0002-readahead-chunk-on-spinning-media.patch \
file://0003-readahead-cleanups.patch \