| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
does it for us.
|
|
|
|
|
| |
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.
|
|
|
|
| |
MFC after: 2 weeks
|
|
|
|
|
| |
Submitted by: mezz
No Cookie For: gordon :)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
| |
Submitted by: marck at rinet dot ru
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
the general principle that mm should do nothing by default) to no.
PR: bin/85449
Submitted by: Kevin Oberman <oberman@es.net>
|
|
|
|
|
|
|
| |
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.
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
| |
only worked because src/Makefile.inc1 is wrapped by src/Makefile.
Silence from: dougb
|
|
|
|
|
|
| |
false positive for every file according to the new stale rc.d checker.
Friendly reminder by: dhw
|
|
|
|
|
|
| |
* Delete a trailing space
* Add a 'stale /etc/rc.d file checker', offer to delete any stale
files for the user.
|
|
|
|
|
|
|
| |
side effect of the distribution target was apparently just good luck
all these years.
Submitted by: ru
|
| |
|
|
|
|
|
|
| |
filename collisions.
Submitted by: des
|
|
|
|
| |
Don't include it in the rcOG removal prompt.
|
|
|
|
|
|
| |
* 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.
|
|
|
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
| |
Noticed by: maxim
|
|
|
|
| |
install time, and make sure to catch any future .db files as well.
|
|
|
|
| |
Submitted by: roam
|
|
|
|
|
|
|
| |
want to match a character $, not EOL. The other is that CVS helpfully
expanded my example into an actual CVS tag.
Submitted by: gad
|
|
|
|
|
|
|
|
|
|
|
|
| |
* 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.
|
|
|
|
| |
* Add an example that ignores CVS Id tags for the new DIFF_OPTIONS variable.
|
| |
|
|
|
|
|
| |
(far easier to use) by limiting the initial display to the size of the
window.
|
| |
|
|
|
|
|
| |
before chflags, and exit non-zero if the old TEMPROOT dir
can't be deleted for whatever reason.
|
|
|
|
|
|
| |
goes to James <James_Bond_79@yahoo.com>, and Cyrille Lefevre
<cyrille.lefevre@laposte.net>. The make variables problem was found
by jon.
|
|
|
|
| |
MFC after: 1 week
|
| |
|
|
|
|
| |
* Make chflags -R more efficient by deleting everything we can first
|
|
|
|
|
| |
directory so that /var/empty, and any other such items that are
added in the future can be deleted effectively.
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
| |
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.
|
|
|
|
| |
Submitted by: brian
|
|
|
|
| |
* Document the COMP_CONFS variable in the .mergemasterrc example
|
|
|
|
|
| |
* Take a simple idea about setting the screen width using stty (for sdiff's
purposes) thoughtfully suggested by Joerg to an absurd conclusion.
|
|
|
|
| |
in the ${TEMPROOT}/usr/obj directory by deleting them first.
|
|
|
|
| |
post-mm rc.conf[.local] comparisons.
|
|
|
|
| |
Thanks to cjc for the idea.
|
|
|
|
|
|
|
|
| |
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"
|