diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2002-06-26 14:14:07 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2002-06-26 14:14:07 +0000 |
| commit | a85eac049232e8f89f3ec3b28d79092a0110e30c (patch) | |
| tree | 680514b507e998d130073d4065a5ab266056807c | |
| parent | 07a1fb30e33f150422f0af7c97217ae4b3b4231f (diff) | |
Notes
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 08dc42595ae1..ee4678f18725 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}" |
