Branch '389-ds-base-1.3.3' - ldap/admin

[Ludwig Krispenz]

ldap/admin/src/scripts/60upgradeconfigfiles.pl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 96850932c054edcc477d070cf619006344b1d443
Author: Ludwig Krispenz 
Date:   Tue Jan 20 10:34:41 2015 +0100

Ticket 47991 - upgrade script fails if /etc and /var are on different file systems

Bug Description:  the script to upgrade configfiles creates a backup dir in /var
                      and tries to move files fro /etc to this backup dir
                      using the perl rename function.
                      this fails if /etc and /var are different fiel systems

Fix Description:   create the backup dir also in /etc

https://fedorahosted.org/389/ticket/47991

Reviewed by: Mark, Thanks

diff --git a/ldap/admin/src/scripts/60upgradeconfigfiles.pl b/ldap/admin/src/scripts/60upgradeconfigfiles.pl
index 4b37353..189eb03 100644
--- a/ldap/admin/src/scripts/60upgradeconfigfiles.pl
+++ b/ldap/admin/src/scripts/60upgradeconfigfiles.pl
@@ -16,7 +16,7 @@ sub runinst {
     # make a backup directory to store the deleted config file, then
     # don't really delete it, just move it to that directory
     my $mode = (stat($inf->{slapd}->{config_dir}))[2];
-    my $bakdir = $inf->{slapd}->{bak_dir} . ".bak";
+    my $bakdir = $inf->{slapd}->{config_dir} . "/bak" ;
     if (! -d $bakdir) {
         $! = 0; # clear
         mkdir $bakdir, $mode;