Commit Graph

92 Commits

Author SHA1 Message Date
Gordon Tetlow
92d4750b38 Add missed SYNOPSIS flag for auto upgrade.
Submitted by:	marck at rinet dot ru
2006-04-30 22:09:47 +00:00
Gordon Tetlow
55a5ff0140 Add auto upgrade capability to mergemaster.
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
2006-04-29 18:21:43 +00:00
Robert Watson
344c91d1b2 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
MFC after:	1 week
2006-02-04 18:24:06 +00:00
Doug Barton
1adffac42b Change the default for deleting stale files from yes (which violates
the general principle that mm should do nothing by default) to no.

PR:		bin/85449
Submitted by:	Kevin Oberman <oberman@es.net>
2005-12-21 08:59:22 +00:00
Giorgos Keramidas
0e0fe87a70 Point to the right path under www.freebsd.org/doc for the Handbook
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.
2005-07-20 12:50:49 +00:00
Ruslan Ermilov
36a142c455 Expand contractions. 2005-02-13 23:45:54 +00:00
Ruslan Ermilov
59a3c79da6 Sort sections. 2005-01-18 20:02:45 +00:00
Ruslan Ermilov
a866e17077 Added the EXIT STATUS section where appropriate. 2005-01-17 07:44:44 +00:00
Ruslan Ermilov
07bfccd71e Mechanically kill hard sentence breaks. 2004-07-02 23:13:00 +00:00
Doug Barton
4c1e476ea1 In the case where /etc/rc.d/ is empty, do not bogusly ask the user if
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
2004-03-07 10:10:19 +00:00
Ruslan Ermilov
3a6849a6e8 Set MAKEOBJDIRPREFIX in the environment, like God intended. This
only worked because src/Makefile.inc1 is wrapped by src/Makefile.

Silence from:	dougb
2004-03-06 15:03:21 +00:00
Doug Barton
d71c565b9c mergemaster -p (pre-world) doesn't populate /etc/rc.d, which led to a
false positive for every file according to the new stale rc.d checker.

Friendly reminder by:	dhw
2004-01-04 22:02:04 +00:00
Doug Barton
b256b34ac1 * Update copyright
* Delete a trailing space
* Add a 'stale /etc/rc.d file checker', offer to delete any stale
files for the user.
2004-01-01 23:41:37 +00:00
Doug Barton
27d5ecc317 Use the actual build target (all), since relying on the build as a
side effect of the distribution target was apparently just good luck
all these years.

Submitted by:	ru
2003-08-04 10:23:45 +00:00
Doug Barton
a15410dee1 Remove MAINTAINER line in favor of the entry in src/MAINTAINERS 2003-06-04 09:38:04 +00:00
Doug Barton
f3fff89357 Preserve directory structure in PRESERVED_FILES_DIR to avoid
filename collisions.

Submitted by:	des
2003-05-03 06:35:19 +00:00
Doug Barton
6203d02c6a rc.sendmail should not have been removed yet.
Don't include it in the rcOG removal prompt.
2003-05-02 11:07:58 +00:00
Doug Barton
c79edb0b27 * Document the -P option
* 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.
2003-05-02 06:28:30 +00:00
Doug Barton
1317aed784 * Add a -P (Preserve) option, which saves a copy of files that you replace.
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.
2003-05-02 06:26:23 +00:00
David E. O'Brien
052238b16c style.Makefile(5) 2003-04-04 17:49:21 +00:00
Doug Barton
5750fb86d7 Put back the deletion of TEMPROOT/etc/passwd.
Noticed by: maxim
2003-03-05 12:42:08 +00:00
Doug Barton
40a392599f Better handle the recent (desirable) change to create login.conf.db at
install time, and make sure to catch any future .db files as well.
2003-03-05 08:20:55 +00:00
Doug Barton
04a2863cfd Try another solution for not expanding a CVS tag.
Submitted by:	roam
2003-02-27 08:29:30 +00:00
Doug Barton
687e6ad79b Try to fix two problems with the -I example. One is the fact that we
want to match a character $, not EOL. The other is that CVS helpfully
expanded my example into an actual CVS tag.

Submitted by:	gad
2003-02-10 06:35:34 +00:00
Doug Barton
1d825c58fb * Update copyright year.
* 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.
2003-02-05 11:09:21 +00:00
Doug Barton
00482d1917 * Update copyright year.
* Add an example that ignores CVS Id tags for the new DIFF_OPTIONS variable.
2003-02-05 11:03:05 +00:00
Matthew Dillon
f959d23788 Backout last commit by request. 2003-01-28 18:44:40 +00:00
Matthew Dillon
c3342fe141 Commit simple mergemaster changes to make the UI more deterministic
(far easier to use) by limiting the initial display to the size of the
window.
2003-01-25 19:12:06 +00:00
Poul-Henning Kamp
0398919dc7 Don't use NO_MAKEDEV* option, its the default now. 2002-10-22 15:04:32 +00:00
Doug Barton
0aed4a4c3f Suppress spurious warning messages about rm -rf TEMPROOT failing
before chflags, and exit non-zero if the old TEMPROOT dir
can't be deleted for whatever reason.
2002-08-05 08:47:52 +00:00
Doug Barton
6ba81e778e Fix a couple DESTDIR related problems. Credit for the "Only in" section
goes to James <James_Bond_79@yahoo.com>, and Cyrille Lefevre
<cyrille.lefevre@laposte.net>. The make variables problem was found
by jon.
2002-08-05 01:03:12 +00:00
Marc Fonvieille
1061be04b3 Correct links to Handbook's pages, old URLs does not work anymore.
MFC after:	1 week
2002-07-30 21:04:26 +00:00
Philippe Charnier
490d5836b5 The .Nm utility 2002-07-14 14:47:15 +00:00
Doug Barton
3a33dac41f * Handle all flags, not just schg
* Make chflags -R more efficient by deleting everything we can first
2002-06-30 18:47:57 +00:00
Doug Barton
a85eac0492 Add 'chflags -R noschg' to the deletion process for the TEMPROOT
directory so that /var/empty, and any other such items that are
added in the future can be deleted effectively.
2002-06-26 14:14:07 +00:00
Doug Barton
30d6b8e113 Go back to taking the user's umask into account. Thanks to Alfred for
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.
2002-06-10 07:16:42 +00:00
Doug Barton
d50489bc95 * Use the new stat(1) to get mode information from the files we
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.
2002-06-06 20:38:22 +00:00
Doug Barton
aaa8b7ff8c Actually accept the default argument to SCREEN_WIDTH.
Submitted by:	brian
2002-05-28 07:25:44 +00:00
Doug Barton
2b0baf3e99 * Fix a small typo, thanks to olgeni
* Document the COMP_CONFS variable in the .mergemasterrc example
2002-05-04 22:53:03 +00:00
Doug Barton
b3559845fb * Add some niceties to make the -p option quieter, and better behaved
* Take a simple idea about setting the screen width using stty (for sdiff's
purposes) thoughtfully suggested by Joerg to an absurd conclusion.
2002-05-04 22:45:12 +00:00
Doug Barton
3e9d29b012 Solve the problem of spuriously comparing files that were created
in the ${TEMPROOT}/usr/obj directory by deleting them first.
2002-04-08 10:30:44 +00:00
Doug Barton
86ba3dedb9 Document the two new options, pre buildworld mode and
post-mm rc.conf[.local] comparisons.
2002-04-08 09:49:40 +00:00
Doug Barton
13c801713d Improve grep'ing for variables in make.conf and rc.conf*.
Thanks to cjc for the idea.
2002-02-25 04:52:56 +00:00
Doug Barton
d7b94dc447 * Add a feature to do a "pre {build|install}world" check of (so far)
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"
2002-02-24 10:22:14 +00:00
Doug Barton
f6694187c2 * Update (c)
* 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.
2002-02-12 09:54:56 +00:00
Doug Barton
cf767f1d8e * Update (c)
* Expand on the definition of the -s (strict) option, at the suggestion
of Gary W. Swearingen, swear@blarg.net.
2002-02-12 09:50:16 +00:00
Doug Barton
e4a9231de9 Hopefully squish the problem of mm creating sendmail files in
the source tree once and for all.

Pointed out by: A cast of thousands

Reviewed by:	asmodai
2001-08-07 06:22:12 +00:00
David E. O'Brien
90e655ea4e Perform a major cleanup of the usr.sbin Makefiles.
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.
2001-07-20 06:20:32 +00:00
Ruslan Ermilov
a4c37c816b mdoc(7) police: removed HISTORY info from the .Os call. 2001-07-10 15:12:08 +00:00
Dima Dorfman
70d51341bf mdoc(7) police: remove extraneous .Pp before and/or after .Sh. 2001-07-09 09:54:33 +00:00