diff options
| author | dougb <dougb@FreeBSD.org> | 2003-03-05 12:42:08 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2003-03-05 12:42:08 +0000 |
| commit | 951f32de97c9f4fd35f87be8a393f8b752a5a7d6 (patch) | |
| tree | 9f633d575f69e32602a4df175174fd3520c15757 /usr.sbin | |
| parent | d259328b0f41056adb67cdef1913368c5c10b705 (diff) | |
| download | FreeBSD-src-951f32de97c9f4fd35f87be8a393f8b752a5a7d6.zip FreeBSD-src-951f32de97c9f4fd35f87be8a393f8b752a5a7d6.tar.gz | |
Put back the deletion of TEMPROOT/etc/passwd.
Noticed by: maxim
Diffstat (limited to 'usr.sbin')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 131ccea..e1830b2 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -558,7 +558,7 @@ esac # or spwd.db. Instead, we want to compare the text versions, and run *_mkdb. # Prompt the user to do so below, as needed. # -rm -f ${TEMPROOT}/etc/*.db +rm -f ${TEMPROOT}/etc/*.db ${TEMPROOT}/etc/passwd # We only need to compare things like freebsd.cf once find ${TEMPROOT}/usr/obj -type f -delete 2>/dev/null |
