summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster
Commit message (Collapse)AuthorAgeFilesLines
* Preserve directory structure in PRESERVED_FILES_DIR to avoiddougb2003-05-031-2/+2
| | | | | | filename collisions. Submitted by: des
* rc.sendmail should not have been removed yet.dougb2003-05-021-2/+2
| | | | Don't include it in the rcOG removal prompt.
* * Document the -P optiondougb2003-05-021-1/+17
| | | | | | * Add a paragraph suggesting that the merge option be used only for files that users have modified. People have been using this option for all files that are different, causing unecessary confusion.
* * Add a -P (Preserve) option, which saves a copy of files that you replace.dougb2003-05-021-20/+50
| | | | | | | | | | The idea for this option came from Marc Schneiders <marc@schneiders.org> * I've been meaning to remove the code that checked for the existence of /etc/sysconfig for a while now, since that file was last seen in 2.2.2. * Replace the above with a check for elements of the old rc system. Offer to move these files out of DESTDIR/etc for the user's convenience.
* style.Makefile(5)obrien2003-04-041-2/+2
|
* Put back the deletion of TEMPROOT/etc/passwd.dougb2003-03-051-1/+1
| | | | Noticed by: maxim
* Better handle the recent (desirable) change to create login.conf.db atdougb2003-03-051-4/+4
| | | | install time, and make sure to catch any future .db files as well.
* Try another solution for not expanding a CVS tag.dougb2003-02-271-1/+1
| | | | Submitted by: roam
* Try to fix two problems with the -I example. One is the fact that wedougb2003-02-101-1/+1
| | | | | | | want to match a character $, not EOL. The other is that CVS helpfully expanded my example into an actual CVS tag. Submitted by: gad
* * Update copyright year.dougb2003-02-051-5/+6
| | | | | | | | | | | | * Give back one line of ws when showing a diff. This was requested by several. * Un-quote DIFF_FLAG, and add DIFF_OPTIONS. This will allow the user to do more creative things in a mergemaster rc file. Un-quoting is necessary in order to handle things like CVS Id tags that look like shell variables. * Simplify terminal width determination. Suggestions related to ignoring the CVS Id's were taken from several, with dillon and gad providing particularly helpful feedback.
* * Update copyright year.dougb2003-02-051-2/+5
| | | | * Add an example that ignores CVS Id tags for the new DIFF_OPTIONS variable.
* Backout last commit by request.dillon2003-01-281-44/+11
|
* Commit simple mergemaster changes to make the UI more deterministicdillon2003-01-251-11/+44
| | | | | (far easier to use) by limiting the initial display to the size of the window.
* Don't use NO_MAKEDEV* option, its the default now.phk2002-10-221-1/+1
|
* Suppress spurious warning messages about rm -rf TEMPROOT failingdougb2002-08-051-3/+3
| | | | | before chflags, and exit non-zero if the old TEMPROOT dir can't be deleted for whatever reason.
* Fix a couple DESTDIR related problems. Credit for the "Only in" sectiondougb2002-08-051-2/+2
| | | | | | goes to James <James_Bond_79@yahoo.com>, and Cyrille Lefevre <cyrille.lefevre@laposte.net>. The make variables problem was found by jon.
* Correct links to Handbook's pages, old URLs does not work anymore.blackend2002-07-301-1/+1
| | | | MFC after: 1 week
* The .Nm utilitycharnier2002-07-141-6/+10
|
* * Handle all flags, not just schgdougb2002-06-301-3/+8
| | | | * Make chflags -R more efficient by deleting everything we can first
* Add 'chflags -R noschg' to the deletion process for the TEMPROOTdougb2002-06-261-1/+2
| | | | | directory so that /var/empty, and any other such items that are added in the future can be deleted effectively.
* Go back to taking the user's umask into account. Thanks to Alfred fordougb2002-06-101-23/+31
| | | | | | | hatching the idea of using dc, and Giorgos (keramida) for incubating it. This also reverses most of the previous commit which took out or modified the text about umask stuff.
* * Use the new stat(1) to get mode information from the files wedougb2002-06-061-34/+33
| | | | | | | are installing. * Since this means that for now we can't accomodate non-standard umask's, warn the user accordingly. * Convert the "press enter to continue" prompt into a function.
* Actually accept the default argument to SCREEN_WIDTH.dougb2002-05-281-0/+3
| | | | Submitted by: brian
* * Fix a small typo, thanks to olgenidougb2002-05-041-1/+4
| | | | * Document the COMP_CONFS variable in the .mergemasterrc example
* * Add some niceties to make the -p option quieter, and better behaveddougb2002-05-041-5/+28
| | | | | * Take a simple idea about setting the screen width using stty (for sdiff's purposes) thoughtfully suggested by Joerg to an absurd conclusion.
* Solve the problem of spuriously comparing files that were createddougb2002-04-081-0/+3
| | | | in the ${TEMPROOT}/usr/obj directory by deleting them first.
* Document the two new options, pre buildworld mode anddougb2002-04-081-1/+12
| | | | post-mm rc.conf[.local] comparisons.
* Improve grep'ing for variables in make.conf and rc.conf*.dougb2002-02-251-4/+4
| | | | Thanks to cjc for the idea.
* * Add a feature to do a "pre {build|install}world" check of (so far)dougb2002-02-241-26/+90
| | | | | | | | 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"
* * Update (c)dougb2002-02-121-2/+5
| | | | | | | | | * Fix a problem with files that have no CVS $Id's. Thanks to naddy for spotting this one. It wasn't a _huge_ problem since almost all the files we install (except motd) have one, but still, it's a bug. * Add a divider between diff outputs, which is helpful both for logs, and for giving a good visual clue for diffs that are smaller than $LINES. Another helpful suggestion from Gary W. Swearingen, swear@blarg.net.
* * Update (c)dougb2002-02-121-1/+3
| | | | | * Expand on the definition of the -s (strict) option, at the suggestion of Gary W. Swearingen, swear@blarg.net.
* Hopefully squish the problem of mm creating sendmail files indougb2001-08-071-1/+3
| | | | | | | | the source tree once and for all. Pointed out by: A cast of thousands Reviewed by: asmodai
* Perform a major cleanup of the usr.sbin Makefiles.obrien2001-07-201-0/+1
| | | | | These are not perfectly in agreement with each other style-wise, but they are orders of orders of magnitude more consistent style-wise than before.
* mdoc(7) police: removed HISTORY info from the .Os call.ru2001-07-101-1/+1
|
* mdoc(7) police: remove extraneous .Pp before and/or after .Sh.dd2001-07-091-2/+0
|
* mdoc(7) police:ru2001-07-051-6/+7
| | | | | | | | | | Use -tag list in the FILES section to work around the bug when .Pa font is not restored to its original value if one of the -hang, -ohang, or -inset lists is used in the FILES section. (The fix for the bug has just been submitted to the GNU Groff maintainers.) Also, fixed the Handbook reference in the SEE ALSO.
* Work around the problem in RELENG_4 where the file doesn't actuallydougb2001-06-201-7/+13
| | | | | | | | | | exist, and therefore mm_install is returning the "fail" value of the test instead of the "success" value for install. This change is a no-op on HEAD, but since the only harm on RELENG_4 ATM is a spurious warning it can follow the usual MFC practice. Submitted by: A cast of thousands :-/
* Add the last of the compatibility mods from openbsd. Neatly, thedougb2001-05-301-9/+14
| | | | | | | | | "install && rm" change fits in with the new FreeBSD default of copy instead of move for install. Changing the order of the deletion of the spurious password files doesn't affect FreeBSD functionality, but it's done in such a way as not to matter. Obtained from: Christian Weisgerber <naddy@mips.inka.de>
* Various fixes, including suggestions from some thoughtful folks, thanks.dougb2001-05-281-18/+47
| | | | | | | | | * Minor umask portability change (Christian Weisgerber <naddy@mips.inka.de>) * Clarify default value of the "run it now" option (bmah) * Make "run it now" $DESTDIR safe (bsd) * Handle installation of hard links for /.profile and /.cshrc properly when the auto-install option is selected * Fix some more whitespace issues
* Clarify handling of /etc/mergemaster.rc and $HOME/.mergemasterrcdougb2001-05-281-1/+6
|
* Be more consistent with the terminology, referring to "temporary anddougb2001-05-281-2/+2
| | | | | | | installed" instead of "old and new". Inspired by the somewhat non-linear PR, which really didn't have a fix, per se. PR: conf/27235 Roelof Osinga <roelof@eboa.com>
* Fix a problem when user selects -a (auto run) but we encounter a filedougb2001-05-281-1/+16
| | | | | | | | | | missing on the system. Instead of passing it by, mm was prompting... bad mm, no cookie! Brought to my attention by the PR, but the fix needed to be tweaked to handle the auto-install option as well. PR: misc/25731 Gilbert Gong <ggong@cal.alumni.berkeley.edu>
* Whitespace only changes to try and fit a little better into 80 columns.dougb2001-05-281-15/+20
|
* mdoc(7) police: normalize .Nd.ru2001-04-181-1/+1
|
* beforeinstall -> SCRIPTS.ru2001-04-071-4/+1
|
* Change NO_MAKEDEV to a finer granularity method:asmodai2001-03-291-1/+1
| | | | | | | | | | NO_MAKEDEV_INSTALL and NO_MAKEDEV_RUN. The former implying the latter. The names imply what they do. The last commit by DES based on a PR defeated the original idea behind NO_MAKEDEV, which was not to run MAKEDEV, but to do the installation of MAKEDEV. This should satisfy both parties on the MAKEDEV challenge. Reflect this in mergemaster, this might later on be decided to be set to NO_MAKEDEV_INSTALL, for now I kept to the old behaviour.
* - Backout botched attempt to introduce MANSECT feature.ru2001-03-261-1/+1
| | | | - MAN[1-9] -> MAN.
* * Add two requested features, source'ing of /etc/mergemaster.rc, anddougb2001-03-052-17/+66
| | | | | | | | | | | | | | asking the user to actually run the recommended commands related to installation of files such as aliases or login.conf. * Return to using grep for CVS $Id comparison. Using ident caused too many problems for people with local CVS/RCS tags in their stuff. Attempt to make portability a little easier to maintain in spite of this change by defining the name of the tag to search for. This is a slightly different change that solves the problem in the PR. PR: bin/24564 Submitted by: Tony Finch <dot@dotat.at>
* Prepare for mdoc(7)NG.ru2000-12-271-4/+3
|
* mdoc(7) police: use the new features of the Nm macro.ru2000-11-201-1/+1
|
OpenPOWER on IntegriCloud