container slashRoot preserve symlinks (CO-2599)

COmanage · Feb 6, 2023 · c4a705f · c4a705f
1 parent 60c7973
commit c4a705f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/container/match/base/comanage_shibboleth_sp_utils.sh b/container/match/base/comanage_shibboleth_sp_utils.sh
@@ -226,11 +226,11 @@ function comanage_shibboleth_sp_utils::process_slash_root() {
 
     pushd "${slash_root}"
 
-    # Copy all files and preserve all details but exclude any files
+    # Copy all files and sysmlinks and preserve all details but exclude any files
     # for the Shibboleth SP if they exist to allow the Shib SP
     # entrypoint script to process that path and prevent a race
     # condition.
-    find etc/shibboleth -type f | xargs -I{} cp --preserve=all --parents {} / > ${OUTPUT} 2>&1
+    find etc/shibboleth -type f,l | xargs -I{} cp --preserve=all --parents --no-dereference {} / > ${OUTPUT} 2>&1
 
     popd
 

diff --git a/container/match/base/comanage_utils.sh b/container/match/base/comanage_utils.sh
@@ -651,11 +651,11 @@ function comanage_utils::process_slash_root() {
 
     pushd "${slash_root}"
 
-    # Copy all files and preserve all details but exclude any files
+    # Copy all files and symlinks and preserve all details but exclude any files
     # for the Shibboleth SP if they exist to allow the Shib SP
     # entrypoint script to process that path and prevent a race
     # condition.
-    find . -type f -not -path "./etc/shibboleth/*" | xargs -I{} cp --preserve=all --parents {} / > ${OUTPUT} 2>&1
+    find . -type f,l -not -path "./etc/shibboleth/*" | xargs -I{} cp --preserve=all --parents --no-dereference {} / > ${OUTPUT} 2>&1
 
     popd