From 030261116e33c2b28d1a27c5fe8db028e45f157f Mon Sep 17 00:00:00 2001
From: dougb <dougb@FreeBSD.org>
Date: Wed, 26 Jun 2002 14:14:07 +0000
Subject: Add 'chflags -R noschg' to the deletion process for the TEMPROOT
 directory so that /var/empty, and any other such items that are added in the
 future can be deleted effectively.

---
 usr.sbin/mergemaster/mergemaster.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'usr.sbin')

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}"
-- 
cgit v1.1