src-test2/usr.sbin/mergemaster, branch stable/6FreeBSD source treehttps://cgit-dev.freebsd.org/src-test2/atom?h=stable%2F62009-07-11T08:25:43ZMFC r193853, update -U message when there is no mtree db, dramatically2009-07-11T08:25:43ZDoug Bartondougb@FreeBSD.org2009-07-11T08:25:43Zurn:sha1:4e0df4a161e490e05cd093f09b5b6410c317a295
reduce the size of the saved mtree db, streamline find command for the
main loop, and remove a spurious comment.
MFC 192219:2009-05-25T04:13:06ZDoug Bartondougb@FreeBSD.org2009-05-25T04:13:06Zurn:sha1:16bb9e6c04c78bf27b571d10eecdd72b2df409ce
Add -L to the mtree invocation to chase symbolic links that are present
in "Service jails."
MFC 192230:
Enhance the safety and efficiency of the -U option,
fix indentation on one line.
MFC 190320, don't expand example $FreeBSD strings2009-03-23T14:54:01ZDoug Bartondougb@FreeBSD.org2009-03-23T14:54:01Zurn:sha1:f5c5448b884957a27729903a0ba02dd5002c00c3MFC r189761, r189763, r189992, r189994:2009-03-21T22:35:44ZDoug Bartondougb@FreeBSD.org2009-03-21T22:35:44Zurn:sha1:8ce5e79f2c2b2d60b1af117d94d88cd5de755aaf
1. Fix creation and saving of the new mtree file with the -D option
2. Clean up usage() and man page so the options are all listed consistently
3. Add -F option
4. More man page cleanups for CVS -> VCS, punctuation, etc.
MFC the changes from r179725, documentation of the AUTO_UPGRADE knob,2009-01-09T11:21:25ZDoug Bartondougb@FreeBSD.org2009-01-09T11:21:25Zurn:sha1:1e51e694234e97a15dd17684f252ac60c099f3ae
and 186677:186749:
o Removal of 184781, 184804, and 184832 (automatic installation of files
that differ only by VCS Id)
o Fix cross-platform builds
o Various improvements to the mtree (-U) feature
o Remove the last of the MAKEDEV stuff
o Switch to using the top level (e.g., /usr/src) Makefile, and specify
that we should use the *.mk files from the source directory instead of
the installed versions.
o Check for the deprecated 'nodev' option in /etc/fstab
o Add support for the IGNORE_FILES variable
o Before installing a file check to make sure that the target does not
already exist as a directory
o Check to be sure that the file installed and error out if not
o We only need to check for the presence of the target of $PAGER
if that variable is actually set
MFC: automatically upgrade files that only differ in CVS Id tag.2008-12-10T11:09:31ZMaxim Sobolevsobomax@FreeBSD.org2008-12-10T11:09:31Zurn:sha1:3843914b97dedd0ff1b90049e5d27dfa3e87a481MFC version 1.55, safety belt for the (unlikely) disappearance of2007-12-24T05:50:46ZDoug Bartondougb@FreeBSD.org2007-12-24T05:50:46Zurn:sha1:5833440b12a1345d928ba92817ca6815cc356f8c
the temproot before a -r run.
MFC auto updating of files not modified by the user.2006-06-10T21:42:49ZGordon Tetlowgordon@FreeBSD.org2006-06-10T21:42:49Zurn:sha1:4ad237e65e0f2bfa1f8701da85533e2695f5b2d7Merge mergemaster.8:1.34, mergemaster.sh:1.53 from HEAD to RELENG_6:2006-02-13T23:47:48ZRobert Watsonrwatson@FreeBSD.org2006-02-13T23:47:48Zurn:sha1:cea5dddffe1f25e6bf97dcb02b754ba7270c9b97
Add a -A argument to mergemaster to allow explicitly specifying an
architecture to pass through to the underlying makefiles. This is
quite useful when building on an i386 box to populate an amd64 NFS
root.
Head nod: dougb
Approved by: re (scottl)
MFC 1.52, do not delete stale /etc/rc.d files by default2005-12-21T09:04:24ZDoug Bartondougb@FreeBSD.org2005-12-21T09:04:24Zurn:sha1:24c2a55a173429bf07a2c07ec626bdd0ca4a7750