aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/mergemaster
Commit message (Collapse)AuthorAgeFilesLines
* MFC r314830:Enji Cooper2017-03-161-4/+5
| | | | | | | | | | | | | | | mergemaster: fix description of -p -p only handles updating /etc/master.passwd and /etc/group . No more, no less. Also, mergemaster (and no other portions of the vanilla FreeBSD build process) should be messing with __MAKECONF or SRCCONF as part of the installworld or distribution process. Don't insinuate that mergemaster does that as it's a false claim. Notes: svn path=/stable/11/; revision=315344
* MFC r302674:Bryan Drewery2016-07-151-1/+1
| | | | | | | | | META_MODE: Don't require filemon(4) for mergemaster(8)/etcupdate(8) Approved by: re (gjb) Notes: svn path=/stable/11/; revision=302912
* All supported releases have the -m support from r186678, so removeBryan Drewery2015-09-291-7/+6
| | | | | | | | | the mention of it and reword this a bit to remove 'you'. MFC after: 3 days Notes: svn path=/head/; revision=288381
* Add META_MODE support.Simon J. Gerraty2015-06-131-0/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Off by default, build behaves normally. WITH_META_MODE we get auto objdir creation, the ability to start build from anywhere in the tree. Still need to add real targets under targets/ to build packages. Differential Revision: D2796 Reviewed by: brooks imp Notes: svn path=/head/; revision=284345
| * dirdeps.mk now sets DEP_RELDIRSimon J. Gerraty2015-06-081-2/+0
| | | | | | | | Notes: svn path=/projects/bmake/; revision=284172
| * Merge head from 7/28Simon J. Gerraty2014-08-192-3/+3
| |\ | |/ |/| | | Notes: svn path=/projects/bmake/; revision=270164
| * Merge headSimon J. Gerraty2014-04-281-3/+10
| |\ | | | | | | | | | Notes: svn path=/projects/bmake/; revision=265044
| * \ Merge headSimon J. Gerraty2013-09-111-1/+1
| |\ \ | | | | | | | | | | | | Notes: svn path=/projects/bmake/; revision=255477
| * \ \ Merge from headSimon J. Gerraty2013-09-052-13/+5
| |\ \ \ | | | | | | | | | | | | | | | Notes: svn path=/projects/bmake/; revision=255263
| * | | | Updated dependenciesSimon J. Gerraty2013-02-161-2/+0
| | | | | | | | | | | | | | | | | | | | Notes: svn path=/projects/bmake/; revision=246868
| * | | | Sync with HEAD.David E. O'Brien2013-02-081-13/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Notes: svn path=/projects/bmake/; revision=246555
| * \ \ \ \ Sync from headSimon J. Gerraty2012-11-041-31/+37
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Notes: svn path=/projects/bmake/; revision=242545
| * | | | | | Sync FreeBSD's bmake branch with Juniper's internal bmake branch.Marcel Moolenaar2012-08-221-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requested by: Simon Gerraty <sjg@juniper.net> Notes: svn path=/projects/bmake/; revision=239572
* | | | | | | Remove ia64.Marcel Moolenaar2014-07-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes: o All directories named *ia64* o All files named *ia64* o All ia64-specific code guarded by __ia64__ o All ia64-specific makefile logic o Mention of ia64 in comments and documentation This excludes: o Everything under contrib/ o Everything under crypto/ o sys/xen/interface o sys/sys/elf_common.h Discussed at: BSDcan Notes: svn path=/head/; revision=268351
* | | | | | | use .Mt to mark up email addresses consistently (part2)Baptiste Daroussin2014-06-201-1/+1
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PR: 191174 Submitted by: Franco Fichtner <franco@lastsummer.de> Notes: svn path=/head/; revision=267668
* | | | | | mergemaster: Avoid "/var/tmp/temproot disappeared" if there is nothing toJilles Tjoelker2014-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compare. Because of the change to find in SVN r253886, the entire temproot would be deleted if it became empty, leading to a confusing message "*** FATAL ERROR: The temproot directory ${TEMPROOT} has disappeared!" Note that mergemaster does not do anything useful in this situation anyway (e.g. put IGNORE_FILES="/etc/group /etc/master.passwd" in /etc/mergemaster.rc and run mergemaster -p). As noted in that commit, add -mindepth 1. PR: bin/188485 Submitted by: David Boyd MFC after: 1 week Notes: svn path=/head/; revision=264480
* | | | | | Generate /var/db/services.db during 'make distribution' so that it isJohn Baldwin2014-01-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | present during new installs. Update etcupdate and mergemaster to ignore the generated file. Tested by: gjb (release build) MFC after: 1 month Notes: svn path=/head/; revision=261031
* | | | | | Fix mergemaster -U by forcing FreeBSD 9 compatiblity in mtree when mtree isBrooks Davis2013-11-221-1/+7
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nmtree. The mtree output used by mergemaster in this case was clearly not meant for computer consumption and an approach based on -f <file1> -f <file2> would probalby be a better idea, but this is a minimal change. MFC after: 3 days X-MFC-with: r258437 Notes: svn path=/head/; revision=258456
* | | | | Pass -n (do not emit comments) when saving mtree information for futureXin LI2013-09-091-1/+1
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mergemaster(8) runs. MFC after: 3 days Approved by: re (kib) Notes: svn path=/head/; revision=255428
* | | | Remove request to email suggestions and fixes to the author.Eitan Adler2013-06-241-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | He is no longer involved with the FreeBSD project. While here: remove "no known bugs" and related. This isn't present in other manual pages. PR: docs/179914 Notes: svn path=/head/; revision=252174
* | | | Don't mess with /etc/localtime if it is a symlink.Peter Wemm2013-05-221-1/+1
| | | | | | | | | | | | | | | | Notes: svn path=/head/; revision=250916
* | | | Permit relative paths with mergemaster -mEitan Adler2013-05-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed by: dim, brooks MFC after: 3 days Notes: svn path=/head/; revision=250463
* | | | Use the system MAKEOBJDIRPREFIX when running make targets inBrooks Davis2013-04-251-4/+3
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mergemaster. This allows bootstrap verions of tools to be used. Add a note to UPDATING about this change. Discussed with: jhb Sponsored by: DARPA, AFRL MFC after: 5 days Notes: svn path=/head/; revision=249906
* | | Remove pointless check for the existence of /usr/bin/less which existsEitan Adler2012-12-051-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in all configurations. Reviewed by: mjg Approved by: cperciva MFC after: 2 weeks Notes: svn path=/head/; revision=243892
* | | Add ability to mergemaster to permit the user to typeEitan Adler2012-12-051-0/+5
| |/ |/| | | | | | | | | | | | | | | | | | | | | the absolute path to PAGER if mergemaster can not find the one already set. Reviewed by: mjg Approved by: cperciva MFC after: 2 weeks Notes: svn path=/head/; revision=243891
* | Remove references to CVS so that people will stop bringing it upDoug Barton2012-10-051-31/+37
|/ | | | | | | | | | | | | | For -p: The localtime update should have been excluded in the first place The make.conf comparison has been OBE for some time now, and there is no src.conf equivalent to share/examples/make.conf, so remove the whole thing. Update copyright Notes: svn path=/head/; revision=241218
* If using DISTDIR we need to be sure to create a ${DESTDIR}/var/db/zoneinfoDoug Barton2011-11-291-2/+2
| | | | | | | | PR: bin/162891 Submitted by: Helge Oldach <src-mergemaster-nov11@oldach.net> Notes: svn path=/head/; revision=228122
* 1. Add a new option, --run-updates, to always or never run the newalises,Doug Barton2011-11-022-17/+63
| | | | | | | | | | | | | | | | pwd_mkdb, etc. updates at the end of the comparison. 2. Add an update to the end to handle /etc/localtime, if it exists. If /var/db/zoneinfo exists, automatically update /etc/localtime, which should (hopefully) be safe to do. If not, prompt the user to run tzsetup. 3. Update run_it_now(), the function that handles input for the updates, to make sure that we got a valid answer, and to handle the --run-updates option if supplied. Notes: svn path=/head/; revision=227013
* Make clear that the -U option can be dangerous. [1]Doug Barton2011-08-092-6/+10
| | | | | | | | | | | | | | In -p mode install the group file with the same permissions as normally done in etc/Makefile. Update the copyright. Requested by: peter [1] Approved by: re (kib) Notes: svn path=/head/; revision=224726
* mdoc: drop redundant .Pp and .LP callsUlrich Spörlein2010-10-081-1/+0
| | | | | | | They have no effect when coming in pairs, or before .Bl/.Bd Notes: svn path=/head/; revision=213573
* Hide the creation and population of the temprootDoug Barton2010-05-141-5/+5
| | | | Notes: svn path=/head/; revision=208088
* Add support run services_mkdb(8).Norikatsu Shigemura2010-05-041-0/+14
| | | | | | | | | Approved by: dougb, imp (mentor) Reviewed by: ume MFC after: 2 weeks Notes: svn path=/head/; revision=207612
* Make it more clear in the docs that -a is not compatible with -iFU,Doug Barton2010-03-142-7/+22
| | | | | | | | | | | and enforce this in the code. Apparently a lot of users mistakenly combine -a with these flags and are then mystified that no changes were made. While I'm here, fix a trailing space in mergemaster.8 Notes: svn path=/head/; revision=205145
* Make -U once again honor -D after my change to consolidate settingDoug Barton2010-01-221-5/+5
| | | | | | | | | | of MTREEDB with DESTDIR. PR: bin/143089 Submitted by: Anton Yuzhaninov <citrin@citrin.ru> Notes: svn path=/head/; revision=202817
* Use the newly brought %U macro.Ruslan Ermilov2010-01-151-1/+1
| | | | Notes: svn path=/head/; revision=202386
* Oops, deleted one line too many. Add back the null case for IGNORE_MOTDDoug Barton2010-01-151-0/+1
| | | | Notes: svn path=/head/; revision=202340
* Now that we've officially arrived at FreeBSD 9, remove the IGNORE_MOTDDoug Barton2010-01-151-5/+2
| | | | | | | compat shim as advertised. This change should not be MFC'ed. Notes: svn path=/head/; revision=202339
* Update copyright dateDoug Barton2010-01-082-24/+30
| | | | | | | | | | | | | | Update delete_temproot() to include the error message if it fails, and clean up the places where it's called. If there are no files left in temproot when the comparison is done delete it without prompting. This should make "automated" runs of mergemaster without -a a little easier. Document the new behavior in the man page. Notes: svn path=/head/; revision=201765
* If we are using -p it does not make any sense to even create theDoug Barton2009-12-311-2/+2
| | | | | | | MTREENEW file since it will never be used. Notes: svn path=/head/; revision=201323
* It's not necessary to include both Op and Fl for command line optionsDoug Barton2009-12-301-9/+11
| | | | | | | | | included in the text, so use only the latter. Clarify that using -U doesn't make sense in combination with -a Notes: svn path=/head/; revision=201293
* Document the DELETE_STALE_RC_FILES option introduced in r201291. This isDoug Barton2009-12-301-16/+19
| | | | | | | | | | | an "rc file only" option by design. While I'm here, update the comments in the example rc file to indicate which command line options they relate to, and correct the defaults for a couple of options. Notes: svn path=/head/; revision=201292
* Add some patches contributed by jhb:Doug Barton2009-12-301-23/+34
| | | | | | | | | | | | | | | | | | 1. Don't prompt the user for "-U but no db" error if we're using -a 2. Add an option to delete stale rc.d files automatically if the user has DELETE_STALE_RC_FILES in their rc file. Lack of command line option for this is not an oversight. 3. Add []'s around the terminal $ for the $FreeBSD$ test for -F For one bug raised by jhb I did a more thorough solution: There were a lot of things that "snuck in" between the end of the test for -r and the start of the comparison. One of them is the creation of the mtree db, as pointed out by jhb. Fix this problem more thoroughly by moving the end of the test down to where it should/used to be, right before the comparison. As a result, indent the interloping code to match. Notes: svn path=/head/; revision=201291
* Fix a problem with how mergemaster handles the hard links for /.cshrcDoug Barton2009-12-191-13/+20
| | | | | | | | | | | | | | | | | | | | | | | and /.profile. The problem is that install(1) will unlink the old file before it installs the new one, which means that in the best case we have to compare the changes for the old file twice. So, change the logic to first test to see if the link exists, then install the file. Then if the link was there and we're using -i, just create the link in /root and be done with it. Otherwise display the message to the user and give them the option. Because we are now sorting things before doing the comparison we can know conclusively that the files in / should be the sources, and the files in /root will be the targets, so adjust the paths accordingly. While I'm here, split a too-long error message into two lines and just return at the end of handling these files instead of setting the variable that says "do nothing" and then returning at the end of the function anyway. Notes: svn path=/head/; revision=200708
* Fix an indentation issue, no functional changesDoug Barton2009-12-191-22/+22
| | | | Notes: svn path=/head/; revision=200701
* In the places where find is used that the user may see the results,Doug Barton2009-12-191-3/+3
| | | | | | | | first pipe it to sort so that order of processing will be deterministic and like things will be grouped together. Notes: svn path=/head/; revision=200700
* Over time things that used to be files/directories/links can changeDoug Barton2009-12-121-2/+59
| | | | | | | | | | | | | | | | to something else. So add code to detect when things don't match and give the user choices about how to fix it. If we're using -P and something in the above check needs to be moved we need to have the directory there for it, so create it at the beginning and delete empty versions of it at the end. The case where something used to be a file or link and now is supposed to be a directory (e.g., /etc/security) is especially dangerous, so make failure to install a necessary directory in $DESTDIR a fatal error. Notes: svn path=/head/; revision=200425
* Simplify handling of MTREEFILE relative to DESTDIRDoug Barton2009-12-111-7/+8
| | | | | | | | Make the message about a missing MTREEFILE combined with -U more informative Notes: svn path=/head/; revision=200416
* 1. Update the message that prints out for -U when the mtree database doesDoug Barton2009-06-091-7/+7
| | | | | | | | | | | | | | not exist to let the user know that it will be created for the next run. 2. Delete more stuff we're not going to use from the temproot prior to creating the mtree database to dramatically reduce its size (162K -> 37K). 3. We've been deleting the zero-size files from temproot for a long time now, so remove the spurious "-size +0" from the find command in the comparison loop, and remove what is now a really stale comment. Notes: svn path=/head/; revision=193853
* Enhance the safety of the -U option:Doug Barton2009-05-161-9/+13
| | | | | | | | | | | | | | | | | 1. In several places make sure that the mtree database is not empty using the -s argument to test instead of -f. (I thought I'd already changed this, but obviously not.) 2. When deriving the list of changed files use a colon-delimited list. 3. If the list of changed files is empty, unset the variable, and test for a non-empty CHANGED in diff_loop() before entering that routine. Enhance the speed of the -U option by using an internal case statement instead of echoing the variable to an external grep for every file. Fix indentation on one line. Notes: svn path=/head/; revision=192230
* Add -L to the mtree invocation to chase symbolic links that are presentDoug Barton2009-05-161-1/+1
| | | | | | | | | in "Service jails." Submitted by: Jeremie Le Hen <jeremie@le-hen.org> Notes: svn path=/head/; revision=192219
generated by cgit v1.3 (git 2.53.0) at 2026-05-12 07:30:09 +0000