From 75dd098dbb433192a40282bbe97404f227bda322 Mon Sep 17 00:00:00 2001
From: Viktor Ashirov <vashirov@redhat.com>
Date: May 23 2019 14:18:55 +0000
Subject: Issue 49754 -  Instance created using dscreate can't be upgraded


Bug Description:
On 1.3.9 remove_ds_instance() is destructive and deletes
/usr/lib64/dirsrv together with perl modules and 389-ds-base libs.

Fix Description:
Backport defaults.inf changes for inst_dir

Relates: https://pagure.io/389-ds-base/issue/49754

Reviewed by: mreynolds (Thanks!)

---

diff --git a/ldap/admin/src/defaults.inf.in b/ldap/admin/src/defaults.inf.in
index 9f5deea..91486c8 100644
--- a/ldap/admin/src/defaults.inf.in
+++ b/ldap/admin/src/defaults.inf.in
@@ -35,7 +35,7 @@ config_dir = @instconfigdir@/slapd-{instance_name}
 local_state_dir = @localstatedir@
 run_dir = @localstatedir@/run/dirsrv
 pid_file = @localstatedir@/run/dirsrv/slapd-{instance_name}.pid
-inst_dir = @serverdir@
+inst_dir = @serverdir@/slapd-{instance_name}
 plugin_dir = @serverplugindir@
 system_schema_dir = @systemschemadir@
 tmpfiles_d = @with_tmpfiles_d@