Patchwork systemd: don't install quotaon.service twice

login
register
mail settings
Submitter Ross Burton
Date June 11, 2013, 5 p.m.
Message ID <1370970003-28809-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/51555/
State Accepted
Commit c6c5c2285e1b6cb3598ccba08aee3dfd090e7129
Headers show

Comments

Ross Burton - June 11, 2013, 5 p.m.
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.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../systemd/systemd/install-quotaon-once.patch     |   32 ++++++++++++++++++++
 meta/recipes-core/systemd/systemd_204.bb           |    1 +
 2 files changed, 33 insertions(+)
 create mode 100644 meta/recipes-core/systemd/systemd/install-quotaon-once.patch

Patch

diff --git a/meta/recipes-core/systemd/systemd/install-quotaon-once.patch b/meta/recipes-core/systemd/systemd/install-quotaon-once.patch
new file mode 100644
index 0000000..10280da
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/install-quotaon-once.patch
@@ -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
+
diff --git a/meta/recipes-core/systemd/systemd_204.bb b/meta/recipes-core/systemd/systemd_204.bb
index 5a63c7c..b8b1290 100644
--- a/meta/recipes-core/systemd/systemd_204.bb
+++ b/meta/recipes-core/systemd/systemd_204.bb
@@ -22,6 +22,7 @@  SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
            file://modprobe.rules \
            ${UCLIBCPATCHES} \
            file://0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch \
+           file://install-quotaon-once.patch \
            file://00-create-volatile.conf \
            file://init \
           "