From owner-cvs-all Sun Feb 24 2:22:17 2002 Delivered-To: cvs-all@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 49F6237B404; Sun, 24 Feb 2002 02:22:14 -0800 (PST) Received: (from dougb@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g1OAMEp48447; Sun, 24 Feb 2002 02:22:14 -0800 (PST) (envelope-from dougb) Message-Id: <200202241022.g1OAMEp48447@freefall.freebsd.org> From: Doug Barton Date: Sun, 24 Feb 2002 02:22:14 -0800 (PST) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh X-FreeBSD-CVS-Branch: HEAD Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG dougb 2002/02/24 02:22:14 PST Modified files: usr.sbin/mergemaster mergemaster.sh Log: * Add a feature to do a "pre {build|install}world" check of (so far) master.passwd, group, and make.conf * Add a feature to check variables in rc.conf[.local] to their counterparts in /etc/defaults/rc.conf after a run * Twiddle whitespace a little * Change some "[ -f file ] && rm file" to "rm -f file" Revision Changes Path 1.27 +90 -26 src/usr.sbin/mergemaster/mergemaster.sh To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message