|
 |
ba46c7 |
From a11be5cc2bbf57f646d2ddb1554d0ce1416dbe33 Mon Sep 17 00:00:00 2001
|
|
|
ba46c7 |
From: Nathan Kinder <nkinder@redhat.com>
|
|
|
ba46c7 |
Date: Thu, 10 Oct 2013 16:50:51 -0700
|
|
|
ba46c7 |
Subject: [PATCH 35/39] Ticket 47513 - tmpfiles.d references /var/lock when they should reference /run/lock
|
|
|
ba46c7 |
|
|
|
ba46c7 |
The previous patch was using numeric comparison instead of string
|
|
|
ba46c7 |
comparison to check if localrundir was empty. This was causing our
|
|
|
ba46c7 |
tmpfiles.d configuration to use the settings from the inf file,
|
|
|
ba46c7 |
which evaluates to /var/run when using --with-fhs.
|
|
|
ba46c7 |
|
|
|
ba46c7 |
This patch uses a proper string comparison which results in using
|
|
|
ba46c7 |
/run in the tmpfiles.d config as desired.
|
|
|
ba46c7 |
(cherry picked from commit 0394b2bb9cae3016eeb975ed194e8c7258ed868b)
|
|
|
ba46c7 |
(cherry picked from commit 0bd980dcc8068c5922ad7ec750622685ed612e48)
|
|
|
ba46c7 |
(cherry picked from commit 848f5c8eed60573fc52ee58595510af6e8d0eb2b)
|
|
|
ba46c7 |
---
|
|
|
ba46c7 |
ldap/admin/src/scripts/DSCreate.pm.in | 2 +-
|
|
|
ba46c7 |
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
ba46c7 |
|
|
|
ba46c7 |
diff --git a/ldap/admin/src/scripts/DSCreate.pm.in b/ldap/admin/src/scripts/DSCreate.pm.in
|
|
|
ba46c7 |
index fb834df..d37cd7b 100644
|
|
|
ba46c7 |
--- a/ldap/admin/src/scripts/DSCreate.pm.in
|
|
|
ba46c7 |
+++ b/ldap/admin/src/scripts/DSCreate.pm.in
|
|
|
ba46c7 |
@@ -1094,7 +1094,7 @@ sub updateTmpfilesDotD {
|
|
|
ba46c7 |
# d /var/run/user 0755 root root 10d
|
|
|
ba46c7 |
# we don't use age
|
|
|
ba46c7 |
my $localrundir = set_localrundir("@localrundir@", $inf->{General}->{prefix});
|
|
|
ba46c7 |
- if( $localrundir != "" && -d "$localrundir"){
|
|
|
ba46c7 |
+ if( $localrundir ne "" && -d "$localrundir"){
|
|
|
ba46c7 |
$rundir = "$localrundir/@PACKAGE_NAME@";
|
|
|
ba46c7 |
$lockdir = "$localrundir/lock/@PACKAGE_NAME@/slapd-$inf->{slapd}->{ServerIdentifier}";
|
|
|
ba46c7 |
$parentdir = "$localrundir/lock/@PACKAGE_NAME@";
|
|
|
ba46c7 |
--
|
|
|
ba46c7 |
1.7.1
|
|
|
ba46c7 |
|