summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mergemaster
Commit message (Collapse)AuthorAgeFilesLines
...
* Don't tempt svn to expand the example $FreeBSD stringsdougb2009-03-232-4/+4
|
* 1. Update for new -F option from r189992.dougb2009-03-181-22/+42
| | | | | | | | | | | 2. Sort the command line options to match how they are displayed in usage() 3. Change references to cvs to the more generic "version control system" and remove the .Xr for cvs 4. Consistently use ".Op Fl" to refer to command line options in the text. 5. Only use the apostrophe to indicate possession. 6. Add FREEBSD_ID (-F) to the list of variables in the example rc, and change the DIFF_OPTIONS example to -Bb since -F now covers it.
* Add a new -F option to automatically install files that differdougb2009-03-181-2/+19
| | | | only by version control Id strings
* 1. Clean up usage() output a bit by grouping options that take an argumentdougb2009-03-131-4/+5
| | | | 2. Fix a comment to refer to the right loop
* When using the -D option:dougb2009-03-131-4/+4
| | | | | | | 1. The new mtree file should be created in the "host" system /tmp 2. The existing mtree file in the "host" system should not be deleted Submitted by: scf
* Instead of using obj and all targets which are not cross-build aware,dougb2009-01-041-3/+4
| | | | | | use _obj and everything which are. Submitted by: ru
* Add a note to the -m option indicating that you should now specify src/dougb2009-01-021-1/+9
| | | | instead of src/etc.
* Simplify the code a little by moving the working part ofdougb2009-01-021-8/+12
| | | | | | | | | ARCHSTRING into the new MM_MAKE variable. We only need to check for the presence of the target of $PAGER if that variable is actually set. [1] Pointed out by: Steve Kargl <sgk@troutmask.apl.washington.edu> [1]
* Only check for 'nodev' in fstab if that file existsdougb2009-01-021-8/+10
| | | | Submitted by: sam
* For IGNORE_FILES delete the version in the TEMPROOT, not the base.dougb2009-01-021-1/+1
| | | | Submitted by: clemens fischer <ino-news@spotteswoode.dnsalias.org>
* General Improvementsdougb2009-01-011-19/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | ==================== 1. List the command line options in a more standard way 2. Improve the explanations of some of the arguments (-A, -D) 3. Add ARCHSTRING and MTREEDB to the example rc file 4. Re-sort some of the examples according to the existing distinction of "has a command line version" vs. "does not have a command line version" Document changes for r186678 =========================== 1. /usr/src/etc -> /usr/src where needed [1] 2. Add IGNORE_FILES to the example rc [2] (and remove IGNORE_MOTD) 3. Update the EXIT STATUS section for [3] and [4] Update Copyright and .Dd accordingly PR: bin/96528 [1] Submitted by: ru [1] PR: bin/106642 [2] Submitted by: Henrik Brix Andersen <henrik@brixandersen.dk> PR: bin/122282 [3] Submitted by: Eygene Ryabinkin <rea-fbsd@codelabs.ru> [3] PR: bin/108183 [4] Submitted by: Riccardo Torrini <riccardo@torrini.org> [4]
* Maintenance and updatesdougb2009-01-011-50/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ======================= 1. Various improvements to the mtree (-U) feature: a. Seperate the notion of directory and file (user can override db path) b. Only check for the existence of the mtree file if -U is set c. Use mktemp to create the new version of the file d. More safely install the new file e. Standardize error messages a bit 2. Remove the last of the MAKEDEV stuff (RIP) New Features ============ 1. 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. [1][2] This allows easier cross builds and simplifies (or in some cases permits) upgrading. 2. Check for the deprecated 'nodev' option in /etc/fstab [3] 3. Add support for the IGNORE_FILES variable [4] and deprecate IGNORE_MOTD accordingly. 4. Before installing a file check to make sure that the target does not already exist as a directory [5] 5. Check to be sure that the file installed and error out if not PR: bin/96528 [1] Submitted by: ru [1] PR: bin/129639 [2] Submitted by: sam [2] PR: bin/122282 [3] Submitted by: Eygene Ryabinkin <rea-fbsd@codelabs.ru> [3] PR: bin/106642 [4] Submitted by: Henrik Brix Andersen <henrik@brixandersen.dk> [4] PR: bin/108183 [5] Submitted by: Riccardo Torrini <riccardo@torrini.org> [5]
* Revert 184781, 184804, and 184832 (automatic installation of filesdougb2009-01-011-19/+0
| | | | | | | | | | | | | | | that differ only by VCS Id) for the following reasons: 1. It was added without my consent, review, or even a heads up 2. It is something that I've repeatedly said I do not want, and certainly do not want as the default 3. It is poorly implemented (much too complex, produces false positives e.g., /etc/mail/helpfile) Given that this is a situation that comes up very infrequently (usually only for a major version upgrade) and can usually be handled simply enough on a one-off basis, I will once again point out that I think this is a Bad Idea. I would be willing to consider a better implementation as an option that is off by default.
* No need to run rm ${COMPFILE} after mm_install() - mm_install()sobomax2008-11-111-1/+0
| | | | does it for us.
* Improve on 184781 - instead of ignoring the file when the only differencesobomax2008-11-091-2/+8
| | | | | is CVS Id, replace the old one with the new one automatically. While I don't see much difference, some people think it's somehow better that way.
* Ignore files that only differ in CVS Id tag.sobomax2008-11-091-0/+14
| | | | MFC after: 2 weeks
* 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.
OpenPOWER on IntegriCloud