diff options
| author | dougb <dougb@FreeBSD.org> | 2005-12-21 08:59:22 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2005-12-21 08:59:22 +0000 |
| commit | 2c94e273ccc2030ed3a21ecba3b645eda808de8a (patch) | |
| tree | 9c10eb0270619a7a6bfd8da34a4435558e6e1f13 /usr.sbin/mergemaster | |
| parent | f6ff25a50ea653bf22e7c80174009503f937f351 (diff) | |
| download | FreeBSD-src-2c94e273ccc2030ed3a21ecba3b645eda808de8a.zip FreeBSD-src-2c94e273ccc2030ed3a21ecba3b645eda808de8a.tar.gz | |
Change the default for deleting stale files from yes (which violates
the general principle that mm should do nothing by default) to no.
PR: bin/85449
Submitted by: Kevin Oberman <oberman@es.net>
Diffstat (limited to 'usr.sbin/mergemaster')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 6ec345a..9a67e43 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -809,17 +809,17 @@ if [ -z "${PRE_WORLD}" -a -z "${RERUN}" ]; then case "${AUTO_RUN}" in '') echo '' - echo -n ' *** Delete them now? [y] ' + echo -n ' *** Delete them now? [n] ' read DELETE_STALE_RC_FILES case "${DELETE_STALE_RC_FILES}" in - [nN]) - echo ' *** Files will not be deleted' - ;; - *) + [yY]) echo ' *** Deleting ... ' rm ${STALE_RC_FILES} echo ' done.' ;; + *) + echo ' *** Files will not be deleted' + ;; esac sleep 2 ;; |
