Re: svn: head/usr.sbin/mergemaster

2009-01-02 Thread Ivan Voras
2009/1/3 Julian Elischer : > Ivan Voras wrote: > >> >> And just how can upgrading all the non-user-modified files cause >> serious damage here (serious=system not bootable, login not possible, >> etc)? Please explain with examples, since from this and the old >> current@ thread I only got the impre

Re: svn: head/usr.sbin/mergemaster

2009-01-02 Thread Maxim Sobolev
Doug Barton wrote: 1. Past experience indicates that your average _developer_ is not very good at estimating what the average _user_ will want as the default. This statement is pretty much self-contradictory. You are saying that average developer is very bad at estimating which behavior should

Re: svn: head/usr.sbin/mergemaster

2009-01-02 Thread Julian Elischer
Ivan Voras wrote: And just how can upgrading all the non-user-modified files cause serious damage here (serious=system not bootable, login not possible, etc)? Please explain with examples, since from this and the old current@ thread I only got the impression that "it's bd, m'kay". Note that

Re: svn: head/usr.sbin/mergemaster

2009-01-02 Thread Ivan Voras
2009/1/3 Doug Barton : > Garrett Wollman wrote: >> < said: >> >>> As I said in my first post, if there is overwhelming demand for this >>> down the road that is not met by the existing solutions I'll consider >>> adding a better implementation as an option, off by default. >> >> It would be much be

Re: svn: head/usr.sbin/mergemaster

2009-01-02 Thread David O'Brien
On Fri, Jan 02, 2009 at 04:51:43PM -0800, Julian Elischer wrote: > I 'm always pissed off that I have to type 'i' so many times. .. > I spend 10 minutes hitting i i i q i i i i i q i q i > (the q is for less or more or whaterver the pager is) I would Dillon's change to avoid all the 'q

Re: svn: head/usr.sbin/mergemaster

2009-01-02 Thread Julian Elischer
Garrett Wollman wrote: < said: Garrett Wollman wrote: It would be much better if the options that *nearly every user will want to use* are set correctly by default. 1. Past experience indicates that your average _developer_ is not very good at estimating what the average _user_ will want a

svn commit: r186708 - in head/sys: netinet netinet6

2009-01-02 Thread Qing Li
Author: qingli Date: Sat Jan 3 00:27:28 2009 New Revision: 186708 URL: http://svn.freebsd.org/changeset/base/186708 Log: Some modules such as SCTP supplies a valid route entry as an input argument to ip_output(). The destionation is represented in a sockaddr{} object that may contain other

svn commit: r186707 - head/sys/kern

2009-01-02 Thread Ed Schouten
Author: ed Date: Fri Jan 2 23:39:29 2009 New Revision: 186707 URL: http://svn.freebsd.org/changeset/base/186707 Log: Fix a corner case in my previous commit. Even though there are not many setups that have absolutely no console device, make sure a close() on a TTY doesn't dereference a n

Re: svn: head/usr.sbin/mergemaster

2009-01-02 Thread Christian Laursen
Garrett Wollman writes: > It would be much better if the options that *nearly every user will > want to use* are set correctly by default. I have to look at the man > page every time I update a system to remind myself what is that magic > option that makes mergemaster do the right thing with fil

svn commit: r186706 - head/sys/kern

2009-01-02 Thread Ed Schouten
Author: ed Date: Fri Jan 2 23:32:43 2009 New Revision: 186706 URL: http://svn.freebsd.org/changeset/base/186706 Log: Don't let /dev/console be revoked if the TTY below is being closed. During startup some of the syscons TTY's are used to set attributes like the screensaver and mouse opti

Re: svn: head/usr.sbin/mergemaster

2009-01-02 Thread Garrett Wollman
< said: > Garrett Wollman wrote: >> It would be much better if the options that *nearly every user will >> want to use* are set correctly by default. > 1. Past experience indicates that your average _developer_ is not very > good at estimating what the average _user_ will want as the default. S

Re: svn: head/usr.sbin/mergemaster

2009-01-02 Thread Doug Barton
Garrett Wollman wrote: > < said: > >> As I said in my first post, if there is overwhelming demand for this >> down the road that is not met by the existing solutions I'll consider >> adding a better implementation as an option, off by default. > > It would be much better if the options that *near

Re: svn commit: r186678 - head/usr.sbin/mergemaster

2009-01-02 Thread Sam Leffler
Doug Barton wrote: Sam Leffler wrote: Doug Barton wrote: Sam Leffler wrote: Doug Barton wrote: Sam Leffler wrote: Doug Barton wrote: 1. Switch to using the top level (e.g., /usr/src) Makefile, and specify that we s

Re: svn: head/usr.sbin/mergemaster

2009-01-02 Thread Garrett Wollman
< said: > As I said in my first post, if there is overwhelming demand for this > down the road that is not met by the existing solutions I'll consider > adding a better implementation as an option, off by default. It would be much better if the options that *nearly every user will want to use* ar

svn commit: r186705 - head/sys/net

2009-01-02 Thread Qing Li
Author: qingli Date: Fri Jan 2 22:51:30 2009 New Revision: 186705 URL: http://svn.freebsd.org/changeset/base/186705 Log: The log message should terminate with a newline instead of a tab character. Modified: head/sys/net/route.c Modified: head/sys/net/route.c ==

svn commit: r186704 - head/usr.sbin/mergemaster

2009-01-02 Thread Doug Barton
Author: dougb Date: Fri Jan 2 22:24:12 2009 New Revision: 186704 URL: http://svn.freebsd.org/changeset/base/186704 Log: Add a note to the -m option indicating that you should now specify src/ instead of src/etc. Modified: head/usr.sbin/mergemaster/mergemaster.8 Modified: head/usr.sbin/mer

Re: svn: head/usr.sbin/mergemaster

2009-01-02 Thread Doug Barton
Maxim Sobolev wrote: > Doug Barton wrote: >> My other objections remain however, including the one about the -U >> option being a better solution that requires no new code. > > 1. -U option requires system to have the copy of the database from the > previous upgrade. It gives no help on the system

Re: svn commit: r186678 - head/usr.sbin/mergemaster

2009-01-02 Thread Doug Barton
Sam Leffler wrote: > Doug Barton wrote: >> Sam Leffler wrote: >> >>> Doug Barton wrote: >>> Sam Leffler wrote: > Doug Barton wrote: > >> 1. Switch to using the top level (e.g., /usr/src) Makefile, and >> specify >> that we should use t

Re: svn commit: r186678 - head/usr.sbin/mergemaster

2009-01-02 Thread Sam Leffler
Doug Barton wrote: Sam Leffler wrote: Doug Barton wrote: Sam Leffler wrote: Doug Barton wrote: 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 versi

Re: svn commit: r186429 - head/sbin/mount_msdosfs

2009-01-02 Thread Brooks Davis
On Tue, Dec 23, 2008 at 01:35:27PM +, Tom Rhodes wrote: > Author: trhodes > Date: Tue Dec 23 13:35:26 2008 > New Revision: 186429 > URL: http://svn.freebsd.org/changeset/base/186429 > > Log: > Document the "-o large" option. > > PR: 129792 > > Modified: > head/sbin/mount_msdo

svn commit: r186696 - head/usr.sbin/fwcontrol

2009-01-02 Thread Warner Losh
Author: imp Date: Fri Jan 2 08:21:21 2009 New Revision: 186696 URL: http://svn.freebsd.org/changeset/base/186696 Log: Add fd = -1 after close when we detect the format so that subsequent open_dev will reopen the device. Modified: head/usr.sbin/fwcontrol/fwcontrol.c Modified: head/usr.sbin