|
 |
f92ce9 |
From 454afeaa481ee389dadc7ce62a53e6f0ff4952b1 Mon Sep 17 00:00:00 2001
|
|
|
f92ce9 |
From: Ludwig Krispenz <lkrispen@redhat.com>
|
|
|
f92ce9 |
Date: Tue, 20 Jan 2015 10:34:41 +0100
|
|
|
f92ce9 |
Subject: [PATCH 58/59] Ticket 47991 - upgrade script fails if /etc and /var
|
|
|
f92ce9 |
are on different file systems
|
|
|
f92ce9 |
|
|
|
f92ce9 |
Bug Description: the script to upgrade configfiles creates a backup dir in /var
|
|
|
f92ce9 |
and tries to move files fro /etc to this backup dir
|
|
|
f92ce9 |
using the perl rename function.
|
|
|
f92ce9 |
this fails if /etc and /var are different fiel systems
|
|
|
f92ce9 |
|
|
|
f92ce9 |
Fix Description: create the backup dir also in /etc
|
|
|
f92ce9 |
|
|
|
f92ce9 |
https://fedorahosted.org/389/ticket/47991
|
|
|
f92ce9 |
|
|
|
f92ce9 |
Reviewed by: Mark, Thanks
|
|
|
f92ce9 |
|
|
|
f92ce9 |
(cherry picked from commit 96850932c054edcc477d070cf619006344b1d443)
|
|
|
f92ce9 |
---
|
|
|
f92ce9 |
ldap/admin/src/scripts/60upgradeconfigfiles.pl | 2 +-
|
|
|
f92ce9 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
f92ce9 |
|
|
|
f92ce9 |
diff --git a/ldap/admin/src/scripts/60upgradeconfigfiles.pl b/ldap/admin/src/scripts/60upgradeconfigfiles.pl
|
|
|
f92ce9 |
index 4b37353..189eb03 100644
|
|
|
f92ce9 |
--- a/ldap/admin/src/scripts/60upgradeconfigfiles.pl
|
|
|
f92ce9 |
+++ b/ldap/admin/src/scripts/60upgradeconfigfiles.pl
|
|
|
f92ce9 |
@@ -16,7 +16,7 @@ sub runinst {
|
|
|
f92ce9 |
# make a backup directory to store the deleted config file, then
|
|
|
f92ce9 |
# don't really delete it, just move it to that directory
|
|
|
f92ce9 |
my $mode = (stat($inf->{slapd}->{config_dir}))[2];
|
|
|
f92ce9 |
- my $bakdir = $inf->{slapd}->{bak_dir} . ".bak";
|
|
|
f92ce9 |
+ my $bakdir = $inf->{slapd}->{config_dir} . "/bak" ;
|
|
|
f92ce9 |
if (! -d $bakdir) {
|
|
|
f92ce9 |
$! = 0; # clear
|
|
|
f92ce9 |
mkdir $bakdir, $mode;
|
|
|
f92ce9 |
--
|
|
|
f92ce9 |
1.9.3
|
|
|
f92ce9 |
|