From 0ed471bae52bb0debd23336cbc5f3f1d400cbbc9 Mon Sep 17 00:00:00 2001

From: Adam Williamson <awilliam@redhat.com>

Date: Thu, 27 Jan 2022 11:07:26 -0800

Subject: [PATCH] Issue 5127 - ds_selinux_restorecon.sh: always exit 0

Description:

We don't want to error out and give up on starting the service

if the restorecon fails - it might just be that the directory

doesn't exist and doesn't need restoring. Issue identified and

fix suggested by Simon Farnsworth

relates: https://github.com/389ds/389-ds-base/issues/5127

Reviewed by: adamw & mreynolds

---

 wrappers/ds_selinux_restorecon.sh.in | 5 +++--

 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/wrappers/ds_selinux_restorecon.sh.in b/wrappers/ds_selinux_restorecon.sh.in

index 063347de3..2d7386233 100644

--- a/wrappers/ds_selinux_restorecon.sh.in

+++ b/wrappers/ds_selinux_restorecon.sh.in

@@ -29,5 +29,6 @@ then

     exit 0

 fi

-# Now run restorecon

-restorecon ${DS_HOME_DIR}

+# Now run restorecon, but don't die if it fails (could be that the

+# directory doesn't exist)

+restorecon ${DS_HOME_DIR} || :

-- 

2.31.1