summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin')
-rwxr-xr-xusr.sbin/mergemaster/mergemaster.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 08dc425..ee4678f 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -425,6 +425,7 @@ case "${RERUN}" in
echo ''
echo " *** Deleting the old ${TEMPROOT}"
echo ''
+ chflags -R noschg "${TEMPROOT}"
rm -rf "${TEMPROOT}"
unset TEST_TEMP_ROOT
;;
@@ -847,7 +848,7 @@ case "${AUTO_RUN}" in
case "${DEL_TEMPROOT}" in
[yY]*)
- if rm -rf "${TEMPROOT}"; then
+ if chflags -R noschg "${TEMPROOT}" && rm -rf "${TEMPROOT}"; then
echo " *** ${TEMPROOT} has been deleted"
else
echo " *** Unable to delete ${TEMPROOT}"
OpenPOWER on IntegriCloud