summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster
Commit message (Collapse)AuthorAgeFilesLines
...
* Document the AUTO_UPGRADE (-U) knob for .mergemasterrcdougb2008-06-111-0/+3
| | | | | Submitted by: mezz No Cookie For: gordon :)
* Remove ISDN4BSD (I4B) from HEAD as it is not MPSAFE andbz2008-05-261-2/+2
| | | | | | | | | | | | | | | | | | parts relied on the now removed NET_NEEDS_GIANT. Most of I4B has been disconnected from the build since July 2007 in HEAD/RELENG_7. This is what was removed: - configuration in /etc/isdn - examples - man pages - kernel configuration - sys/i4b (drivers, layers, include files) - user space tools - i4b support from ppp - further documentation Discussed with: rwatson, re
* In the following scenario:dougb2007-12-211-0/+7
| | | | | | | | | | | | | | | 1. Start mergemaster 2. Interrupt it 3. < Somehow the temproot directory disappears > 4. mergemaster -r Many bad things can happen, especially if the -i option is in use. Therefore, add a check to make sure it still exists before we start comparing files. Brought to my attention by: PR: bin/40538 Submitted by: Cyrille Lefevre <cyrille.lefevre@laposte.net>
* Add missed SYNOPSIS flag for auto upgrade.gordon2006-04-301-1/+1
| | | | Submitted by: marck at rinet dot ru
* Add auto upgrade capability to mergemaster.gordon2006-04-292-1/+88
| | | | | | | | | | | | | | | | | | | An mtree description of all non-zero files that make distribution installs (only size and md5) is built from the temproot. When the user completes a mergemaster run, the mtree description file gets installed into /var/db for safe-keeping. When the user then decides to do a subsequent upgrade (with the -U flag), the existing mtree description from /var/db is called into service looking for files that are different in DESTDIR. This is stashed away until a file that would normally end up prompting the user to look at changes is encountered. Since there are no user modified changes, the new file is installed without bothering the user. Looked at by: dougb MFC after: 6 weeks
* Add a -A argument to mergemaster to allow explicitly specifying anrwatson2006-02-042-8/+17
| | | | | | | | | 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 MFC after: 1 week
* Change the default for deleting stale files from yes (which violatesdougb2005-12-211-5/+5
| | | | | | | the general principle that mm should do nothing by default) to no. PR: bin/85449 Submitted by: Kevin Oberman <oberman@es.net>
* Point to the right path under www.freebsd.org/doc for the Handbookkeramida2005-07-201-1/+1
| | | | | | | section on "make world". The old link still works fine, but all the hyperlinks of the referenced document are broken; the same links work find if /doc/en_US.ISO8859-1 is used instead of plain /doc to reach the online Handbook copy.
* Expand contractions.ru2005-02-131-1/+1
|
* Sort sections.ru2005-01-181-34/+34
|
* Added the EXIT STATUS section where appropriate.ru2005-01-171-1/+1
|
* Mechanically kill hard sentence breaks.ru2004-07-021-3/+7
|
* In the case where /etc/rc.d/ is empty, do not bogusly ask the user ifdougb2004-03-071-1/+1
| | | | | | | they want to delete '*'. It turns out that there is one valid case where this might happen, installing to an empty DESTDIR. Patch submitted by: schweikh
* Set MAKEOBJDIRPREFIX in the environment, like God intended. Thisru2004-03-061-3/+3
| | | | | | only worked because src/Makefile.inc1 is wrapped by src/Makefile. Silence from: dougb
* mergemaster -p (pre-world) doesn't populate /etc/rc.d, which led to adougb2004-01-041-5/+4
| | | | | | false positive for every file according to the new stale rc.d checker. Friendly reminder by: dhw
* * Update copyrightdougb2004-01-011-2/+51
| | | | | | * Delete a trailing space * Add a 'stale /etc/rc.d file checker', offer to delete any stale files for the user.
* Use the actual build target (all), since relying on the build as adougb2003-08-041-0/+1
| | | | | | | side effect of the distribution target was apparently just good luck all these years. Submitted by: ru
* Remove MAINTAINER line in favor of the entry in src/MAINTAINERSdougb2003-06-041-2/+0
|
* 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
OpenPOWER on IntegriCloud