diff options
| author | dougb <dougb@FreeBSD.org> | 2002-06-26 14:14:07 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2002-06-26 14:14:07 +0000 |
| commit | 030261116e33c2b28d1a27c5fe8db028e45f157f (patch) | |
| tree | 680514b507e998d130073d4065a5ab266056807c /usr.sbin/mergemaster | |
| parent | 43c345ecb488ac34f43c78620d2b18f1b5cbbd81 (diff) | |
| download | FreeBSD-src-030261116e33c2b28d1a27c5fe8db028e45f157f.zip FreeBSD-src-030261116e33c2b28d1a27c5fe8db028e45f157f.tar.gz | |
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.
Diffstat (limited to 'usr.sbin/mergemaster')
| -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 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}" |
