From 951f32de97c9f4fd35f87be8a393f8b752a5a7d6 Mon Sep 17 00:00:00 2001 From: dougb Date: Wed, 5 Mar 2003 12:42:08 +0000 Subject: Put back the deletion of TEMPROOT/etc/passwd. Noticed by: maxim --- usr.sbin/mergemaster/mergemaster.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'usr.sbin') 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 -- cgit v1.1