Re: Mergemaster
On 5 February 2012 23:59, Net Warrior netwarrior...@gmail.com wrote: Hi there. I found very tedious when , after a makeworld the mergemaster process to say (i) to install/upgrade/replace/ with the new file, specially when there are a lot of files I was reading the documentation but it's not clear to me which option to use to automate the process, which is the right one, or combination? -U -F -iF? Thanks for your time and support Regards __**_ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/**mailman/listinfo/freebsd-**questionshttp://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-** unsubscr...@freebsd.org freebsd-questions-unsubscr...@freebsd.org here is my rc file it takes care of most of the stuff. Once installed just run mergemaster with no flags $ cat /etc/mergemaster.rc AUTO_INSTALL=YES AUTO_UPGRADE=YES PRESERVE_FILES=yes #IGNORE_FILES=/etc/rc.d/* DIFF_OPTIONS='-I$FreeBSD:.*[$]' PRESERVE_FILES_DIR=/var/mergemaster/preserved-files-`date +%y%m%d-%H%M%S` IGNORE_FILES=/etc/crontab /etc/fstab /etc/group /etc/hosts /etc/inetd.conf /etc/make.conf /etc/master.passwd /etc/motd /etc/newsyslog.conf /etc/ntp.conf /etc/ntp.drift /etc/profile /etc/rc.conf /etc/resolv.conf /etc/services /etc/shells /etc/syslog.conf /etc/ssh/sshd_config /etc/ssh/ssh_host_key /etc/ssh/ssh_host_key.pub /etc/ssh/ssh_host_rsa_key /etc/ssh/ssh_host_rsa_key.pub /etc/passwd /etc/rc.conf.local /etc/zfs/exports /etc//namedb/named.conf /etc/periodic.conf /etc/hosts.allow /etc/hosts /etc/pf.conf /etc/sysctl.conf /etc/make.conf /etc/src.conf /etc/mail/aliases /etc/mail/mailer.conf /etc/remote /etc/ppp/ppp.conf /etc/nsswitch.conf /etc/locate.rc ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: Mergemaster
On Sun, 5 Feb 2012 17:40:14 -0700 (MST) Warren Block wbl...@wonkity.com wrote: On Sun, 5 Feb 2012, Net Warrior wrote: Hi there. I found very tedious when , after a makeworld the mergemaster process to say (i) to install/upgrade/replace/ with the new file, specially when there are a lot of files I was reading the documentation but it's not clear to me which option to use to automate the process, which is the right one, or combination? -U -F -iF? -Ui takes a long time the first time, then is much better the next time. ___ One shortcut that works very well if you haven't made any customizations there that you're afraid will be overwritten, is to 'rm -rf /etc/rc.d' before running mergemaster, so it can just automatically add all the new files without prompting. HTH -- Conrad J. Sabatier conr...@cox.net ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: Mergemaster
On Sun, 5 Feb 2012, Net Warrior wrote: Hi there. I found very tedious when , after a makeworld the mergemaster process to say (i) to install/upgrade/replace/ with the new file, specially when there are a lot of files I was reading the documentation but it's not clear to me which option to use to automate the process, which is the right one, or combination? -U -F -iF? -Ui takes a long time the first time, then is much better the next time. ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster confusion
On Thu, 7 Jul 2011, d...@safeport.com wrote: I have a mergemaster question. I assume this is my error but do not see what I did. I am testing remote update procedures so I started with a 7.0 IS0 and updated it to 7.4. My mergemaster.rc has the following directives: FREEBSD_ID=yes AUTO_UPGRADE=yes AUTO_INSTALL=yes DELETE_STALE_RC_FILES=yes COMP_CONFS=yes plus some diff options. As this was a system with nothing changed except for group, passwd, and csh.cshrc, I expected mergemaster to update all the other files. I think from the code the value does not matter for the first three so yes would be ok (if I am correct). As this did not work (as I expected), I retried with mergemaster -rFUi getting the same result. What did I do wrong? I was afraid that was the answer. Dusting off my script seems to be it. ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster -U ask for a lot non-user modified files
On 24/02/2011 07:05, Matthew Seaman wrote: On 23/02/2011 22:14, Lowell Gilbert wrote: David Demelierdemelier.da...@gmail.com writes: I also noticed that even with the -F flag, mergemaster still asks for files that only differs by CVS id, see : -# $FreeBSD: src/etc/sendmail/freebsd.mc,v 1.37.2.2.2.1 2010/06/14 02:09:0 6 kensmith Exp $ # +# $FreeBSD: src/etc/sendmail/freebsd.mc,v 1.37.2.2.4.1 2010/12/21 17:09:2 5 kensmith Exp $ # Again, I think this is a local problem on your system. It certainly works on my system (RELENG_8, updated this week). mergemaster -U functionality depends on mergemaster having recorded an mtree database of what the contents of your /etc (and various other bits) looks like. The first time you run mergemaster with the -U flag, it's going to ask you about a lot of files -- but after that, it remembers and you only get asked about updating files you've previously modified. The recommendation for minimizing the amount of questions asked is: * the first time you run mergemaster, on a newly installed machine: mergemaster -UFi (This will involve quite a lot of user interaction) * for any subsequent updates: mergemaster -Ui (Which will be much more automated) The other handy tip is to make sure you don't delete the $FreeBSD$ tags from your fles, and that when the file is modified upstream, you merge in the new value for the tag. Doing this certainly works for me -- frequently the only file I get asked about is /etc/motd Cheers, Matthew Yes that's true, now mergemaster do not ask me for any file except /etc/passwd, /etc/login.conf /etc/rc.conf and so on :) Thanks, cheers, -- David Demelier ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster -U ask for a lot non-user modified files
On 02/24/11 06:05, Matthew Seaman wrote: [Snip mergemaster options discussion.] Doing this certainly works for me -- frequently the only file I get asked about is /etc/motd And if you don't care about updating /etc/motd (the first line is automagically updated every boot anyway) add IGNORE_FILES='/etc/motd' to /etc/mergemaster.rc ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster -U ask for a lot non-user modified files
On 18/02/2011 14:25, Lowell Gilbert wrote: David Demelierdemelier.da...@gmail.com writes: Hello, Each time I run mergemaster -UiF, it asks for a lot of file that I do not have modified such as /dev/rc.d/* and /etc/defaults/* == Use 'd' to delete the temporary ./etc/network.subr Use 'i' to install the temporary ./etc/network.subr Use 'm' to merge the temporary and installed versions Use 'v' to view the diff results again Default is to leave the temporary file to deal with by hand How should I deal with this? [Leave it for later] I never touched this file! Why it asks me to install the new one? You're probably having problems with the mtree database that mergemaster uses for that. I think by default it's /var/db/mergemaster.mtree. I also noticed that even with the -F flag, mergemaster still asks for files that only differs by CVS id, see : -# $FreeBSD: src/etc/sendmail/freebsd.mc,v 1.37.2.2.2.1 2010/06/14 02:09:0 6 kensmith Exp $ # +# $FreeBSD: src/etc/sendmail/freebsd.mc,v 1.37.2.2.4.1 2010/12/21 17:09:2 5 kensmith Exp $ # It's really painful.. -- David Demelier ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster -U ask for a lot non-user modified files
David Demelier demelier.da...@gmail.com writes: I also noticed that even with the -F flag, mergemaster still asks for files that only differs by CVS id, see : -# $FreeBSD: src/etc/sendmail/freebsd.mc,v 1.37.2.2.2.1 2010/06/14 02:09:0 6 kensmith Exp $ # +# $FreeBSD: src/etc/sendmail/freebsd.mc,v 1.37.2.2.4.1 2010/12/21 17:09:2 5 kensmith Exp $ # Again, I think this is a local problem on your system. It certainly works on my system (RELENG_8, updated this week). ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster -U ask for a lot non-user modified files
On 23/02/2011 22:14, Lowell Gilbert wrote: David Demelier demelier.da...@gmail.com writes: I also noticed that even with the -F flag, mergemaster still asks for files that only differs by CVS id, see : -# $FreeBSD: src/etc/sendmail/freebsd.mc,v 1.37.2.2.2.1 2010/06/14 02:09:0 6 kensmith Exp $ # +# $FreeBSD: src/etc/sendmail/freebsd.mc,v 1.37.2.2.4.1 2010/12/21 17:09:2 5 kensmith Exp $ # Again, I think this is a local problem on your system. It certainly works on my system (RELENG_8, updated this week). mergemaster -U functionality depends on mergemaster having recorded an mtree database of what the contents of your /etc (and various other bits) looks like. The first time you run mergemaster with the -U flag, it's going to ask you about a lot of files -- but after that, it remembers and you only get asked about updating files you've previously modified. The recommendation for minimizing the amount of questions asked is: * the first time you run mergemaster, on a newly installed machine: mergemaster -UFi (This will involve quite a lot of user interaction) * for any subsequent updates: mergemaster -Ui (Which will be much more automated) The other handy tip is to make sure you don't delete the $FreeBSD$ tags from your fles, and that when the file is modified upstream, you merge in the new value for the tag. Doing this certainly works for me -- frequently the only file I get asked about is /etc/motd Cheers, Matthew -- Dr Matthew J Seaman MA, D.Phil. 7 Priory Courtyard Flat 3 PGP: http://www.infracaninophile.co.uk/pgpkey Ramsgate JID: matt...@infracaninophile.co.uk Kent, CT11 9PW signature.asc Description: OpenPGP digital signature
Re: mergemaster -U ask for a lot non-user modified files
David Demelier demelier.da...@gmail.com writes: Hello, Each time I run mergemaster -UiF, it asks for a lot of file that I do not have modified such as /dev/rc.d/* and /etc/defaults/* == Use 'd' to delete the temporary ./etc/network.subr Use 'i' to install the temporary ./etc/network.subr Use 'm' to merge the temporary and installed versions Use 'v' to view the diff results again Default is to leave the temporary file to deal with by hand How should I deal with this? [Leave it for later] I never touched this file! Why it asks me to install the new one? You're probably having problems with the mtree database that mergemaster uses for that. I think by default it's /var/db/mergemaster.mtree. ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster comparing everything.
On Fri, 12 Nov 2010, Leon Me?ner wrote: Hi, is there a trick besides using the rcs funktion of mergemaster to get around having to look at every file in /etc for comparison? I know there once was a bug in mergemaster but it's closed for a long time now. Example: *** Displaying differences between ./etc/periodic/daily/300.calendar and installed version: --- /etc/periodic/daily/300.calendar2010-07-29 12:54:42.0 +0200 +++ ./etc/periodic/daily/300.calendar 2010-11-12 17:06:33.0 +0100 @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/periodic/daily/300.calendar,v 1.5.36.1.4.1 2010/06/14 02:09:06 kensmith Exp $ +# $FreeBSD: src/etc/periodic/daily/300.calendar,v 1.5.36.1 2009/08/03 08:13:06 kensmith Exp $ # # `calendar -a' needs to die. Why? Because it's a bad idea, particular # with networked home directories, but also in general. If you want # the 90% of the differences are just in this cvs? tag lines. This is an upgrade from 8.1 to -STABLE. Greetings, Leon Check out the man page version 8 with FBSD there are many options. I tossed a script I wrote in favor of the following in /etc/mergemaster.rc: # Automatically install files that do not exist AUTO_INSTALL='yes' # Automatically upgrade files that have not been edited AUTO_UPGRADE='yes' # Ignore files that I don't want changed #IGNORE_FILES='/etc/motd' # Do not display changes that only affect whitespace #DIFF_FLAG='.Bub' # Ignore CVS id lines to stop replacing files where only that line has changed DIFF_OPTIONS='-I$FreeBSD:.*[$]' With apologizes to whoever first posted this, I did not save the name. ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster comparing everything.
On Fri, 12 Nov 2010, Leon Me?ner wrote: is there a trick besides using the rcs funktion of mergemaster to get around having to look at every file in /etc for comparison? I know there once was a bug in mergemaster but it's closed for a long time now. ... 90% of the differences are just in this cvs? tag lines. This is an upgrade from 8.1 to -STABLE. 'mergemaster -Ui' helps. ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster comparing everything.
On Fri, Nov 12, 2010 at 09:40:01AM -0700, Warren Block wrote: On Fri, 12 Nov 2010, Leon Me?ner wrote: is there a trick besides using the rcs funktion of mergemaster to get around having to look at every file in /etc for comparison? I know there once was a bug in mergemaster but it's closed for a long time now. ... 90% of the differences are just in this cvs? tag lines. This is an upgrade from 8.1 to -STABLE. 'mergemaster -Ui' helps. thanks, that helped. Did the default behavior of mergemaster change somewhere because i didn't have to do this awhile ago (months not years). greetings, Leon ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster comparing everything.
On Fri, 12 Nov 2010, Leon Me?ner wrote: On Fri, Nov 12, 2010 at 09:40:01AM -0700, Warren Block wrote: On Fri, 12 Nov 2010, Leon Me?ner wrote: is there a trick besides using the rcs funktion of mergemaster to get around having to look at every file in /etc for comparison? I know there once was a bug in mergemaster but it's closed for a long time now. ... 90% of the differences are just in this cvs? tag lines. This is an upgrade from 8.1 to -STABLE. 'mergemaster -Ui' helps. thanks, that helped. Did the default behavior of mergemaster change somewhere because i didn't have to do this awhile ago (months not years). Not AFAIK, but I've been using -Ui for quite a while, so maybe I just missed it. ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster comparing everything.
On Fri, Nov 12, 2010 at 09:04, Leon Meßner l.mess...@physik.tu-berlin.de wrote: On Fri, Nov 12, 2010 at 09:40:01AM -0700, Warren Block wrote: On Fri, 12 Nov 2010, Leon Me?ner wrote: is there a trick besides using the rcs funktion of mergemaster to get around having to look at every file in /etc for comparison? I know there once was a bug in mergemaster but it's closed for a long time now. ... 90% of the differences are just in this cvs? tag lines. This is an upgrade from 8.1 to -STABLE. 'mergemaster -Ui' helps. thanks, that helped. Did the default behavior of mergemaster change somewhere because i didn't have to do this awhile ago (months not years). The problem is the svn to cvs exporter doesn't properly tag the existing revisions for releases, but rather checks in a brand new revision and tags that. So, when you switch branches (such as release to stable) with CVS, all the $FreeBSD$ tags change, and you get the false positives in mergemaster. Using your example (etc/periodic/daily/300.calendar), there is: 1.5.36.1.4.1 for RELENG_8_1 1.5.36.1 for RELENG_8 1.5 for MAIN (current) There are many more 1.5.x revisions for other branches. These shouldn't exist - the file hasn't changed since 2000 and 1.5 should just be tagged with for all releases since then. -- Rob Farmer ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster -U overwriting modified files
-BEGIN PGP SIGNED MESSAGE-
Hash: RIPEMD160
Mel Flynn wrote:
On Sunday 26 April 2009 11:12:12 Frederique Rijsdijk wrote:
Bruce Cran wrote:
On Sat, 25 Apr 2009 12:10:42 +0200
Peter Schuller peter.schul...@infidyne.com wrote:
I recently began testing mergemaster -U since the perpetual review
diff of file I never touched grows annoying real quick.
Unfortunately I recently discovered that it does not seem to do what
you might expect. For example it nuked my mailer.conf on one machine,
and my /etc/namedb/named.conf (!!!) on another machine.
Is this a bug or intended? What is the intended functionality of -U?
I noticed this recently too: after using mergemaster -U without
problems for a long time it suddenly went and overwrote named.conf on
a recently upgrade of 7-STABLE.
I've seen this happen as well with named.conf.
I think I know the cause, not entirely the problem yet, as I just got hit by
this too and right at the point where I upgraded source tree from cvs to svn
so *all* files had different idents.
Before running mergemaster -iU I checked /var/db/mergemaster.mtree and it was
zero-sized. Why, is not entirely clear, (hence, I don't know the real
problem)
but I thought I noticed mergemaster saving mtree database on the pre-world
run. Looking at the code though, this should be impossible, so the more I
think about it, the more I start to doubt. At the time I was thinking why is
mergemaster saving the mtree and that's when I checked it's size.
Whatever the cause, this is where mergemaster fails:
CHANGED=
if [ -n ${AUTO_UPGRADE} -a -f ${DESTDIR}${MTREEFILE} ]; then
for file in `mtree -eq -f ${DESTDIR}${MTREEFILE} -p ${DESTDIR}/ \
2/dev/null | awk '($2 == changed) {print $1}'`; do
if [ -f ${DESTDIR}/$file ]; then
CHANGED=${CHANGED} ${DESTDIR}/$file
fi
done
fi
Because ${MTREEFILE} is empty, the mtree command will not produce output and
CHANGED will not be populated. For things like this, it would be nice if
mtree
supported a 'lint' mode to check syntax, but at the very least could
mergemaster test for -s rather then or in addition to -f?
Thank you for your analysis Mel. This problem has come up on other
lists as well, and while I don't have an answer for why the mtree file
is getting reduced down to zero size (which shouldn't actually be
possible) I had pretty much come to the same conclusion as you did
that this must be the cause of the problem.
I just committed r192230 which changes -f to -s in several places, and
also adds some new safety belts to the way that mergemaster creates
and uses the list of changed files in the comparison process. I think
that these changes will solve the effects of the problem (an empty
CHANGED list as a result of an empty mtree file). I also changed a -f
to a -s on the routine that saves the new mtree file, so hopefully
whatever the bug is that created this problem in the first place will
no longer be able to wreak havoc.
If you're interested in trying the new version you can just grab the
one from HEAD via the cvs or svn interfaces and run it on RELENG_[67]
without any problems.
hope this helps,
Doug
- --
This .signature sanitized for your protection
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.11 (FreeBSD)
iEYEAREDAAYFAkoPRdcACgkQyIakK9Wy8PvTqACg1Lw8ICzT7XyicSeOA9K+8834
lwYAn3g7bmuM4YeGMDyYYjKYClHvLohb
=9JuD
-END PGP SIGNATURE-
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster -U overwriting modified files
On Sunday 26 April 2009 11:12:12 Frederique Rijsdijk wrote:
Bruce Cran wrote:
On Sat, 25 Apr 2009 12:10:42 +0200
Peter Schuller peter.schul...@infidyne.com wrote:
I recently began testing mergemaster -U since the perpetual review
diff of file I never touched grows annoying real quick.
Unfortunately I recently discovered that it does not seem to do what
you might expect. For example it nuked my mailer.conf on one machine,
and my /etc/namedb/named.conf (!!!) on another machine.
Is this a bug or intended? What is the intended functionality of -U?
I noticed this recently too: after using mergemaster -U without
problems for a long time it suddenly went and overwrote named.conf on
a recently upgrade of 7-STABLE.
I've seen this happen as well with named.conf.
I think I know the cause, not entirely the problem yet, as I just got hit by
this too and right at the point where I upgraded source tree from cvs to svn
so *all* files had different idents.
Before running mergemaster -iU I checked /var/db/mergemaster.mtree and it was
zero-sized. Why, is not entirely clear, (hence, I don't know the real problem)
but I thought I noticed mergemaster saving mtree database on the pre-world
run. Looking at the code though, this should be impossible, so the more I
think about it, the more I start to doubt. At the time I was thinking why is
mergemaster saving the mtree and that's when I checked it's size.
Whatever the cause, this is where mergemaster fails:
CHANGED=
if [ -n ${AUTO_UPGRADE} -a -f ${DESTDIR}${MTREEFILE} ]; then
for file in `mtree -eq -f ${DESTDIR}${MTREEFILE} -p ${DESTDIR}/ \
2/dev/null | awk '($2 == changed) {print $1}'`; do
if [ -f ${DESTDIR}/$file ]; then
CHANGED=${CHANGED} ${DESTDIR}/$file
fi
done
fi
Because ${MTREEFILE} is empty, the mtree command will not produce output and
CHANGED will not be populated. For things like this, it would be nice if mtree
supported a 'lint' mode to check syntax, but at the very least could
mergemaster test for -s rather then or in addition to -f?
--
Mel
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster -U overwriting modified files
Peter Schuller wrote: I recently began testing mergemaster -U since the perpetual review diff of file I never touched grows annoying real quick. Unfortunately I recently discovered that it does not seem to do what you might expect. For example it nuked my mailer.conf on one machine, and my /etc/namedb/named.conf (!!!) on another machine. Is this a bug or intended? What is the intended functionality of -U? It may be useful, prior to running mergemaster -U, to run mtree -eq -f /var/db/mergemaster.mtree -p / | grep changed to see what mergemaster considers changed. -- Victor Sudakov, VAS4-RIPE, VAS47-RIPN sip:suda...@sibptus.tomsk.ru ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster -U overwriting modified files
Bruce Cran wrote: On Sat, 25 Apr 2009 12:10:42 +0200 Peter Schuller peter.schul...@infidyne.com wrote: I recently began testing mergemaster -U since the perpetual review diff of file I never touched grows annoying real quick. Unfortunately I recently discovered that it does not seem to do what you might expect. For example it nuked my mailer.conf on one machine, and my /etc/namedb/named.conf (!!!) on another machine. Is this a bug or intended? What is the intended functionality of -U? I noticed this recently too: after using mergemaster -U without problems for a long time it suddenly went and overwrote named.conf on a recently upgrade of 7-STABLE. I've seen this happen as well with named.conf. I've noticed that sometimes the -U flag doesn't work (I use -Ui), I still have to install the never touched files by hand. Can't put a finger on it though. -- Frederique ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster -U overwriting modified files
On Apr 25, 2009, at 5:10 AM, Peter Schuller wrote: Unfortunately I recently discovered that it does not seem to do what you might expect. For example it nuked my mailer.conf on one machine, and my /etc/namedb/named.conf (!!!) on another machine. Me, too. I lost exactly those two files during recent updates on two machines, using -Ui to mergemaster. After restoring them from back-up, I've added them to the exclude list in mergemaster.rc as IGNORE_FILES='/etc/motd /etc/namedb/named.conf /etc/mail/mailer.conf' Until I saw your post and the other responses, I had just assumed that I'd been somehow careless when running mergemaster. But now it looks like a bug. I've been using -Ui for mergemaster for a while now, but only seem to have experienced this problem recently. Cheers, -j -- Jeffrey Goldberghttp://www.goldmark.org/jeff/ ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster -U overwriting modified files
On Sat, 25 Apr 2009 12:10:42 +0200 Peter Schuller peter.schul...@infidyne.com wrote: I recently began testing mergemaster -U since the perpetual review diff of file I never touched grows annoying real quick. Unfortunately I recently discovered that it does not seem to do what you might expect. For example it nuked my mailer.conf on one machine, and my /etc/namedb/named.conf (!!!) on another machine. Is this a bug or intended? What is the intended functionality of -U? I noticed this recently too: after using mergemaster -U without problems for a long time it suddenly went and overwrote named.conf on a recently upgrade of 7-STABLE. -- Bruce Cran ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: Mergemaster Problem
On Thu, 23 Apr 2009 14:54:25 -0700 (PDT), Annelise Anderson
and...@andrsn.stanford.edu wrote:
I'm running mergemaster as root (-v -i -c) on an upgrade to
stable (I rebooted with the new kernel but have not done
the install) and can't run mergemaster, with result as follows:
Default is to use /var/tmp/temproot as is
How should I deal with this? [Use the existing /var/tmp/temproot] d
*** Deleting the old /var/tmp/temproot
*** Creating the temporary root environment in /var/tmp/temproot
*** /var/tmp/temproot ready for use
*** Creating and populating directory structure in /var/tmp/temproot
*** Press the [Enter] or [Return] key to continue
/usr/src/etc/Makefile, line 34: Malformed conditional (${MK_AMD} != no)
/usr/src/etc/Makefile, line 36: if-less endif
[...]
*** FATAL ERROR: Cannot 'cd' to /usr/src/etc and install files to
the temproot environment
Any suggestions?
Hi Annelise,
It seems you are running mergemaster with a new kernel but with the old
make(1) binary across a major release update. Since part of the update
process spawned by mergemaster depends on `make' and the `/usr/share/mk'
files, you have to installworld before you can use the new megemaster
script.
The pre-buildworld mode of mergemaster (`mergemaster -p') should run
fine even with an old userland and old `/usr/share/mk' files. But you
should install everything before you run a full mergemaster update of
all files in `/etc'.
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: Mergemaster Problem
On Fri, 24 Apr 2009, Giorgos Keramidas wrote:
On Thu, 23 Apr 2009 14:54:25 -0700 (PDT), Annelise Anderson
and...@andrsn.stanford.edu wrote:
I'm running mergemaster as root (-v -i -c) on an upgrade to
stable (I rebooted with the new kernel but have not done
the install) and can't run mergemaster, with result as follows:
Default is to use /var/tmp/temproot as is
How should I deal with this? [Use the existing /var/tmp/temproot] d
*** Deleting the old /var/tmp/temproot
*** Creating the temporary root environment in /var/tmp/temproot
*** /var/tmp/temproot ready for use
*** Creating and populating directory structure in /var/tmp/temproot
*** Press the [Enter] or [Return] key to continue
/usr/src/etc/Makefile, line 34: Malformed conditional (${MK_AMD} != no)
/usr/src/etc/Makefile, line 36: if-less endif
[...]
*** FATAL ERROR: Cannot 'cd' to /usr/src/etc and install files to
the temproot environment
Any suggestions?
Hi Annelise,
It seems you are running mergemaster with a new kernel but with the old
make(1) binary across a major release update. Since part of the update
process spawned by mergemaster depends on `make' and the `/usr/share/mk'
files, you have to installworld before you can use the new megemaster
script.
The pre-buildworld mode of mergemaster (`mergemaster -p') should run
fine even with an old userland and old `/usr/share/mk' files. But you
should install everything before you run a full mergemaster update of
all files in `/etc'.
Right you are. Thanks. Now I understand what I was reading in UPDATING.
Annelise
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster options
On Apr 6, 2009, at 5:43 AM, Charles Howse wrote: Hi, I'm upgrading form 4.6-RELEASE to 4.6-STABLE. So sorry...that should be from 6.4-RELEASE to 6.4-STABLE ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster options
Charles Howse wrote: Hi, I'm upgrading form 4.6-RELEASE to 4.6-STABLE. When I get to the *second* run of mergemaster (after installworld), I'd be interested to hear the list's comments on using options to start mergemaster. For example, have you had good luck with: mergemaster -i -u (install any files that don't already exist, and attempt to install any files that haven't been user-modified) Yes, I am using this all the time. Note that you need a capital U: mergemaster -iU Also, what is the first line of a file used for? What parts of the OS 'care' about that line? What would happen if I kept the existing file below, with it's older date and version #? (This is just a made-up example). keep this existing file: # $FreeBSD: src/etc/csh.cshrc,v 1.3 1999/08/27 23:23:40 peter Exp $ my custom line blah delete this (fake) temporary file: # $FreeBSD: src/etc/csh.cshrc,v 1.4 2000/08/27 23:23:40 peter Exp $ blah blah I hope that's clear...? The lines you see starting with $FreeBSD are used by the Version Control System (CVS or SVN). You have to judge by the content of the older file (not by the tag) whether to keep or upgrade the file. Usually, you will let it upgrade all files which you have not modified yourself. In some of these the only thing that changes is the tag. Before doing the mergemaster step, I suggest you keep a complete backup copy of your /etc directory. It may happen that you replace a file you actually need. And it is a real problem if you overwrite, say, master.passwd :) ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster options
On Apr 6, 2009, at 7:03 AM, Manolis Kiagias wrote: Charles Howse wrote: Hi, I'm upgrading form 4.6-RELEASE to 4.6-STABLE. When I get to the *second* run of mergemaster (after installworld), I'd be interested to hear the list's comments on using options to start mergemaster. For example, have you had good luck with: mergemaster -i -u (install any files that don't already exist, and attempt to install any files that haven't been user-modified) Yes, I am using this all the time. Note that you need a capital U: mergemaster -iU Right, capital U. That's good to know. Thanks. Also, what is the first line of a file used for? What parts of the OS 'care' about that line? What would happen if I kept the existing file below, with it's older date and version #? (This is just a made-up example). keep this existing file: # $FreeBSD: src/etc/csh.cshrc,v 1.3 1999/08/27 23:23:40 peter Exp $ my custom line blah delete this (fake) temporary file: # $FreeBSD: src/etc/csh.cshrc,v 1.4 2000/08/27 23:23:40 peter Exp $ blah blah I hope that's clear...? The lines you see starting with $FreeBSD are used by the Version Control System (CVS or SVN). You have to judge by the content of the older file (not by the tag) whether to keep or upgrade the file. Usually, you will let it upgrade all files which you have not modified yourself. In some of these the only thing that changes is the tag. Before doing the mergemaster step, I suggest you keep a complete backup copy of your /etc directory. It may happen that you replace a file you actually need. And it is a real problem if you overwrite, say, master.passwd :) Actually, I wasn't asking about the CVS line with regard to mergemaster. I realize that mergemaster will stop and ask about any file in its list with a CVS line older than the new file. What I really want to know is, let's say the file above is /etc/ hosts.allow, and I have customized it according to my needs. If I leave the old file in /etc, I'm thinking it will still work just fine. It's only mergemaster, and maybe cvsup, and things that actually deal with version control that are concerned with the CVS line. Am I correct? ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster options
Charles Howse wrote: Actually, I wasn't asking about the CVS line with regard to mergemaster. I realize that mergemaster will stop and ask about any file in its list with a CVS line older than the new file. What I really want to know is, let's say the file above is /etc/hosts.allow, and I have customized it according to my needs. If I leave the old file in /etc, I'm thinking it will still work just fine. It's only mergemaster, and maybe cvsup, and things that actually deal with version control that are concerned with the CVS line. Am I correct? You are correct. As long as the content of the file is right for the purpose, the line added by CVS is simply ignored by anything and everything - except mergemaster and friends when upgrading. ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster options
On Apr 6, 2009, at 10:24 AM, Manolis Kiagias wrote: Charles Howse wrote: Actually, I wasn't asking about the CVS line with regard to mergemaster. I realize that mergemaster will stop and ask about any file in its list with a CVS line older than the new file. What I really want to know is, let's say the file above is /etc/hosts.allow, and I have customized it according to my needs. If I leave the old file in /etc, I'm thinking it will still work just fine. It's only mergemaster, and maybe cvsup, and things that actually deal with version control that are concerned with the CVS line. Am I correct? You are correct. As long as the content of the file is right for the purpose, the line added by CVS is simply ignored by anything and everything - except mergemaster and friends when upgrading. As I suspected. Thanks for the confirmation. I have completed my upgrade to 6.4-STABLE with the following hiccups: mergemaster -iU couldn't find a btree database, so it skipped the auto update. It did save a database at the end, so I assume I can use that next time. I never thought to check for which side of the screen the old file was on after I chose m to merge. Finally figured out that the old file is on the left, and the temp on the right. Once finished completely, there were no problems I couldn't recover from. Good thing this is a brand new installation, with only 2 accounts! :-) Thanks for all the help! ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster goof when src upgrading 7.0 - 7.1
On Wed, Jan 7, 2009 at 10:55 PM, Peter Boosten pe...@boosten.org wrote: matt donovan wrote: On Wed, Jan 7, 2009 at 3:34 PM, Peter Boosten pe...@boosten.org wrote: Well, my point is that mergemaster shouldn't have to delete ALL accounts, just to add one. User and group accounts can be added to the passwd/group file *without* deleting the others. mergemaster doesn't delete ALL accounts if you do it correctly. I usually leave the files for later and then manually do it. Your 'do it correctly' refers to 'leave it for later', however I've read at least twice yesterday, that someone *accidentally* 'installed' the file from /var/tmp/temproot. *That* should not be possible in the first place. Thank heaven it never happened to me (knock on wood), but a mistake is easily made, especially when you just went through a whole bunch of updated rc scripts. Peter -- http://www.boosten.org myself I just watch the file name line since I don't touch files outside of /usr. unless it's for example ppp.conf ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster goof when src upgrading 7.0 - 7.1
Le 07/01/2009 à 07:06:53+0100, Peter Boosten a écrit Johann Hasselbach wrote: I was doing a src upgrade from 7.0 to 7.1 After installkernel, i rebooted, and accidently ran mergemaster instead of mergemaster -p before installworld. I ctrl-c'd once I realized what I had done, but the damage was done. It seems to have overwritten my password and group files. I've stated this before: In my opinion this entire 'I want to overwrite your passwd file' attitude from mergemaster is nonsense: at installation time you're required to add an additional user, and mergemaster wants to undo that again. Well...i'm not developper but long time ago, when I update from FreeBSD x.y to Freebsd x+1,(0-1) I loose many time to find something don't work because the Freebsd x+1 need some new system account. Regards. -- Albert SHIH SIO batiment 15 Observatoire de Paris Meudon 5 Place Jules Janssen 92195 Meudon Cedex Téléphone : 01 45 07 76 26 Heure local/Local time: Mer 7 jan 2009 21:20:36 CET ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster goof when src upgrading 7.0 - 7.1
Albert Shih wrote: Le 07/01/2009 à 07:06:53+0100, Peter Boosten a écrit Johann Hasselbach wrote: I was doing a src upgrade from 7.0 to 7.1 After installkernel, i rebooted, and accidently ran mergemaster instead of mergemaster -p before installworld. I ctrl-c'd once I realized what I had done, but the damage was done. It seems to have overwritten my password and group files. I've stated this before: In my opinion this entire 'I want to overwrite your passwd file' attitude from mergemaster is nonsense: at installation time you're required to add an additional user, and mergemaster wants to undo that again. Well...i'm not developper but long time ago, when I update from FreeBSD x.y to Freebsd x+1,(0-1) I loose many time to find something don't work because the Freebsd x+1 need some new system account. Well, my point is that mergemaster shouldn't have to delete ALL accounts, just to add one. User and group accounts can be added to the passwd/group file *without* deleting the others. Peter -- http://www.boosten.org ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: Mergemaster failing before 7.1 installworld
I did mergemaster -p previously, my issue was resolved with this svn commit fixing the build prefix in mergemaster: http://svn.freebsd.org/viewvc/base/head/usr.sbin/mergemaster/mergemaster.sh?view=markuppathrev=186678 Thanks for the suggestion though. Floyd Skeren Kelly LLP *Phillip Andrew Hocking* * Network Engineer* Address 23801 Calabasas Road, Suite 2025 Calabasas, CA 91302 Phone (559) 474-3511 Fax (818) 206-9223 Website http://www.fsklaw.com Email phock...@fsklaw.com mailto:phock...@fsklaw.com * Please Note*: This message is intended only for the use of the individual or entity to whom it is addressed and may contain information that is privileged, confidential and exempt from disclosure under applicable law. If the reader of this message is not the intended recipient, you are hereby notified that any dissemination, distribution or use of this communication is strictly prohibited. If you have received this communication in error, please immediately notify the sender by reply email and also delete the original and any attached documentation. Thank you. brad davison wrote: Greetings. I have updated to 7.1 from a 6.2 box. Kernel built and installed successfully, world built successfully, however mergemaster is failing: $ mergemaster *** Unable to find mtree database. Skipping auto-upgrade. I may be stating the obvious, but being before the /installworld/ shouldn't that be a '/mergemaster -p/' and not just /mergemaster/? From the FreeBSD Handbook: After installkernel finishes successfully, you should boot in single user mode (i.e. using boot -s from the loader prompt). Then run: # mount -a -t ufs # mergemaster -p # cd /usr/src # make installworld # mergemaster # reboot Windows LiveTM: Keep your life in sync. See how it works. http://windowslive.com/howitworks?ocid=TXT_TAGLM_WL_t1_allup_howitworks_012009 ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
RE: Mergemaster failing before 7.1 installworld
Greetings. I have updated to 7.1 from a 6.2 box. Kernel built and installed successfully, world built successfully, however mergemaster is failing: $ mergemaster *** Unable to find mtree database. Skipping auto-upgrade. I may be stating the obvious, but being before the installworld shouldn't that be a 'mergemaster -p' and not just mergemaster? From the FreeBSD Handbook: After installkernel finishes successfully, you should boot in single user mode (i.e. using boot -s from the loader prompt). Then run:# mount -a -t ufs # mergemaster -p # cd /usr/src # make installworld # mergemaster # reboot _ Windows LiveTM: Keep your life in sync. http://windowslive.com/howitworks?ocid=TXT_TAGLM_WL_t1_allup_howitworks_012009___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster goof when src upgrading 7.0 - 7.1
On Wed, Jan 7, 2009 at 3:34 PM, Peter Boosten pe...@boosten.org wrote: Albert Shih wrote: Le 07/01/2009 à 07:06:53+0100, Peter Boosten a écrit Johann Hasselbach wrote: I was doing a src upgrade from 7.0 to 7.1 After installkernel, i rebooted, and accidently ran mergemaster instead of mergemaster -p before installworld. I ctrl-c'd once I realized what I had done, but the damage was done. It seems to have overwritten my password and group files. I've stated this before: In my opinion this entire 'I want to overwrite your passwd file' attitude from mergemaster is nonsense: at installation time you're required to add an additional user, and mergemaster wants to undo that again. Well...i'm not developper but long time ago, when I update from FreeBSD x.y to Freebsd x+1,(0-1) I loose many time to find something don't work because the Freebsd x+1 need some new system account. Well, my point is that mergemaster shouldn't have to delete ALL accounts, just to add one. User and group accounts can be added to the passwd/group file *without* deleting the others. Peter -- http://www.boosten.org ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org mergemaster doesn't delete ALL accounts if you do it correctly. I usually leave the files for later and then manually do it. ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster goof when src upgrading 7.0 - 7.1
matt donovan wrote: On Wed, Jan 7, 2009 at 3:34 PM, Peter Boosten pe...@boosten.org wrote: Well, my point is that mergemaster shouldn't have to delete ALL accounts, just to add one. User and group accounts can be added to the passwd/group file *without* deleting the others. mergemaster doesn't delete ALL accounts if you do it correctly. I usually leave the files for later and then manually do it. Your 'do it correctly' refers to 'leave it for later', however I've read at least twice yesterday, that someone *accidentally* 'installed' the file from /var/tmp/temproot. *That* should not be possible in the first place. Thank heaven it never happened to me (knock on wood), but a mistake is easily made, especially when you just went through a whole bunch of updated rc scripts. Peter -- http://www.boosten.org ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster goof when src upgrading 7.0 - 7.1
Johann Hasselbach wrote: I was doing a src upgrade from 7.0 to 7.1 After installkernel, i rebooted, and accidently ran mergemaster instead of mergemaster -p before installworld. I ctrl-c'd once I realized what I had done, but the damage was done. It seems to have overwritten my password and group files. I've stated this before: In my opinion this entire 'I want to overwrite your passwd file' attitude from mergemaster is nonsense: at installation time you're required to add an additional user, and mergemaster wants to undo that again. There are other ways to create new accounts or groups than simply overwriting passwd/group files. Also: most scripts updated by mergemaster during 7.0-7.1 are only version numbering diffs. Is there no smarter way to do this, apart from typing 'i' every time? Having to go through mergemaster is the most tedious job I've ever done (it would probably be bearable if only one machine was involved). Did I damage anything else? You might wanna look at hosts, login.conf, ssh config, pam, audit, sendmail, syslog.conf, basically everything in /etc. Peter -- http://www.boosten.org ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster goof when src upgrading 7.0 - 7.1
On Wed, Jan 07, 2009 at 07:06:53AM +0100, Peter Boosten wrote: Johann Hasselbach wrote: I was doing a src upgrade from 7.0 to 7.1 After installkernel, i rebooted, and accidently ran mergemaster instead of mergemaster -p before installworld. I ctrl-c'd once I realized what I had done, but the damage was done. It seems to have overwritten my password and group files. I've stated this before: In my opinion this entire 'I want to overwrite your passwd file' attitude from mergemaster is nonsense: at installation time you're required to add an additional user, and mergemaster wants to undo that again. There are other ways to create new accounts or groups than simply overwriting passwd/group files. Also: most scripts updated by mergemaster during 7.0-7.1 are only version numbering diffs. Is there no smarter way to do this, apart from typing 'i' every time? I think you want -U option (auto upgrade files that have not been modified by user) along with -i (install missing files). Having to go through mergemaster is the most tedious job I've ever done (it would probably be bearable if only one machine was involved). Did I damage anything else? You might wanna look at hosts, login.conf, ssh config, pam, audit, sendmail, syslog.conf, basically everything in /etc. Peter -- http://www.boosten.org Yuri ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster goof when src upgrading 7.0 - 7.1
Yuri Pankov writes: Also: most scripts updated by mergemaster during 7.0-7.1 are only version numbering diffs. Is there no smarter way to do this, apart from typing 'i' every time? I think you want -U option (auto upgrade files that have not been modified by user) along with -i (install missing files). How does it deteremine what's been user-modified? I've got a few things that have local edits that, for reasons of laziness, still have the same version tag. Robert Huff ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster goof when src upgrading 7.0 - 7.1
Yuri Pankov wrote: On Wed, Jan 07, 2009 at 07:06:53AM +0100, Peter Boosten wrote: Also: most scripts updated by mergemaster during 7.0-7.1 are only version numbering diffs. Is there no smarter way to do this, apart from typing 'i' every time? I think you want -U option (auto upgrade files that have not been modified by user) along with -i (install missing files). After reading the man page the -s option seems to be more appropriate (unless I misread that bit, of course :-) ). Peter -- http://www.boosten.org ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions-unsubscr...@freebsd.org
Re: mergemaster problem
Jack Raats wrote: after upgrade 6.3 to 7.0 mergemaster didn't do the job properly After a normal reboot I get a lot of Warnings like /etc/rc: WARNING: $variable_enable is not set properly - see rc.conf(5) HOw to solve this problem??? Thanks Jack Rerun mergemaster. When it asks you to [i]nstall the new /etc/defaults/rc.conf, [m]erge it or leave it for later. Choose i. ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: mergemaster not found
At 01:15 PM 7/9/2007, Jean-Paul Natola wrote: I've restart in SUM and when I attempt* to run mergemaster it returns; Where should I run this from? You may need to be sure all your mounts are mounted, not just / try: mount -a -Derek -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. MailScanner thanks transtec Computers for their support. ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
RE: mergemaster not found
-Original Message- From: Derek Ragona [mailto:[EMAIL PROTECTED] Sent: Monday, July 09, 2007 2:26 PM To: Jean-Paul Natola; freebsd-questions@freebsd.org Subject: Re: mergemaster not found At 01:15 PM 7/9/2007, Jean-Paul Natola wrote: I've restart in SUM and when I attempt* to run mergemaster it returns; Where should I run this from? You may need to be sure all your mounts are mounted, not just / try: mount -a I tried that - it worked- sort of I ran the mergemaster -p - then when it completed I tried make installword and I STILL get the audit group is missing- which I was under the impression that mergemaster -p was suppose to address that - ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
RE: mergemaster not found
At 01:35 PM 7/9/2007, Jean-Paul Natola wrote: -Original Message- From: Derek Ragona [mailto:[EMAIL PROTECTED] Sent: Monday, July 09, 2007 2:26 PM To: Jean-Paul Natola; freebsd-questions@freebsd.org Subject: Re: mergemaster not found At 01:15 PM 7/9/2007, Jean-Paul Natola wrote: I've restart in SUM and when I attempt* to run mergemaster it returns; Where should I run this from? You may need to be sure all your mounts are mounted, not just / try: mount -a I tried that - it worked- sort of I ran the mergemaster -p - then when it completed I tried make installword and I STILL get the audit group is missing- which I was under the impression that mergemaster -p was suppose to address that - No, sounds like you are doing an upgrade and didn't read /usr/src/UPDATING If you check that file you will see things you need to do like add any missing groups. -Derek -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. MailScanner thanks transtec Computers for their support. ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: mergemaster and vimdiff
Dan Casey [EMAIL PROTECTED] writes: Is there anyway to use vimdiff with mergemaster. Not easily; the diff(1) command is hard-wired into the mergemaster script. However, you could do your own comparison with MM_EXIT_SCRIPT. Also, remember that mergemaster is just a shell script itself, and you can use it as a base for your own version. Or is it safe to just see what files are different in etc, and vimdiff them manually? It's safe, but not necessarily easy. mergemaster is a lot easier than doing it by hand. Before mergemaster was added to the system, I used this script: http://Be-Well.Ilk.Org/~lowell/systuff/scripts/update-etc and then diff'd by hand. Are you aware of the '-a' option for mergemaster? That will leave you with a tree that contains only the files that mergemaster thinks need a human to look at... I see /var/tmp/temproot has a lot more in it that I was expecting. I thought it would be just etc. Most of that is directories without files, though; *almost* everything that can actually be changed is in /etc. ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: mergemaster and RELENG6
On Fri, 11 Nov 2005, J. W. Ballantine wrote: I'm trying to install RELEASE6 on a BSD machine, and the install fails in the mergemaster stage with: ... cap_mkdb: illegal option -- l usage: cap_mkdb [-v] [-f outfile] file [file ...] *** Error code 1 Stop in /usr/src/etc. *** FATAL ERROR: Cannot 'cd' to /usr/src/etc and install files to the temproot environment The steps I took were: copied /etc/rc.d to /etc/old_rc.d removed /usr/src/* /usr/obj/* cvsup'ed RELENG6 changed to /usr/src did a make buildworld did a make buildkernel did a make installkernel did a mergemaster -i Anyone have any thoughts on what is causing mergemaster to fail? Probably because you skipped the 'make installworld' step and are still running an old copy of mergemaster. -Warren Block * Rapid City, South Dakota USA ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: mergemaster and RELENG6
Thanks, my understanding was mergemaster before installworld. But that appears to be wrong. -- In Response to your message - Date: Fri, 11 Nov 2005 07:05:37 -0700 (MST) To: J. W. Ballantine [EMAIL PROTECTED] From: Warren Block [EMAIL PROTECTED] Subject: Re: mergemaster and RELENG6 On Fri, 11 Nov 2005, J. W. Ballantine wrote: I'm trying to install RELEASE6 on a BSD machine, and the install fails in the mergemaster stage with: ... cap_mkdb: illegal option -- l usage: cap_mkdb [-v] [-f outfile] file [file ...] *** Error code 1 Stop in /usr/src/etc. *** FATAL ERROR: Cannot 'cd' to /usr/src/etc and install files to the temproot environment The steps I took were: copied /etc/rc.d to /etc/old_rc.d removed /usr/src/* /usr/obj/* cvsup'ed RELENG6 changed to /usr/src did a make buildworld did a make buildkernel did a make installkernel did a mergemaster -i Anyone have any thoughts on what is causing mergemaster to fail? Probably because you skipped the 'make installworld' step and are still running an old copy of mergemaster. -Warren Block * Rapid City, South Dakota USA ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: mergemaster and RELENG6
J. W. Ballantine [EMAIL PROTECTED] writes: Thanks, my understanding was mergemaster before installworld. But that appears to be wrong. Close, but not quite. http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html#AEN27814 ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: mergemaster problem
On 03/14/05 00:02:43, masterkev28 masterkev28 wrote: Hi, I didn't rebuild world, or kernel, however just some regular routine portupgrade -a. The problem is that no matter what I do with mergemaster, I get this error( also the same error occurs on another box of mine), and it started happening about a week ago after I did cvsup. It keeps complaining the line 76~80 in /usr/src/etc/Makefile, where I have no idea what's wrong with this file. Thanks, Kev Cvsup! Cvsup what, the stanard file to upgrade your base system? You don't need mergemaster unless you cvsup your base system, and if you did that and merged the new files, thats bad. You should rebuild the world and the kernel then install them. And don't cvsup unless you intend to upgrade your base system. That can put things out of sink. On Mon, 14 Mar 2005 02:29:10 +, Jason Henson [EMAIL PROTECTED] wrote: On 03/13/05 17:08:56, masterkev28 masterkev28 wrote: Hello everyone, When I do mergemaster -ia, I get the following errors: *** The directory specified for the temporary root environment, /var/tmp/temproot, exists. This can be a security risk if untrusted users have access to the system. Why are you using -ia, they are th opposit in the man page. You should: # make buildworld # make buildkernel # make installkernel # reboot After installkernel finishes successfully, you should boot in single user mode (i.e. using boot -s from the loader prompt). Then run: # mergemaster -p # make installworld # mergemaster # reboot ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to freebsd-questions- [EMAIL PROTECTED] ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: mergemaster problem
On 03/13/05 17:08:56, masterkev28 masterkev28 wrote: Hello everyone, When I do mergemaster -ia, I get the following errors: *** The directory specified for the temporary root environment, /var/tmp/temproot, exists. This can be a security risk if untrusted users have access to the system. Why are you using -ia, they are th opposit in the man page. You should: # make buildworld # make buildkernel # make installkernel # reboot After installkernel finishes successfully, you should boot in single user mode (i.e. using boot -s from the loader prompt). Then run: # mergemaster -p # make installworld # mergemaster # reboot ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: mergemaster problem
Hi, I didn't rebuild world, or kernel, however just some regular routine portupgrade -a. The problem is that no matter what I do with mergemaster, I get this error( also the same error occurs on another box of mine), and it started happening about a week ago after I did cvsup. It keeps complaining the line 76~80 in /usr/src/etc/Makefile, where I have no idea what's wrong with this file. Thanks, Kev On Mon, 14 Mar 2005 02:29:10 +, Jason Henson [EMAIL PROTECTED] wrote: On 03/13/05 17:08:56, masterkev28 masterkev28 wrote: Hello everyone, When I do mergemaster -ia, I get the following errors: *** The directory specified for the temporary root environment, /var/tmp/temproot, exists. This can be a security risk if untrusted users have access to the system. Why are you using -ia, they are th opposit in the man page. You should: # make buildworld # make buildkernel # make installkernel # reboot After installkernel finishes successfully, you should boot in single user mode (i.e. using boot -s from the loader prompt). Then run: # mergemaster -p # make installworld # mergemaster # reboot ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED] ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: mergemaster -i
On Tue, 30 Nov 2004 18:28:42 -0600, Conrad J. Sabatier [EMAIL PROTECTED] wrote: On Wed, 1 Dec 2004 00:09:13 +0100, Gert Cuykens [EMAIL PROTECTED] wrote: can someone make a options i install everything so you don't have to push 58 times i enter i enter i enter i enter :) drives me nuts especially when you sometimes have to do enter enter enter to scroll down the preview and then accidentally do 1 enter to many You can press q to interrupt the display of a file. After all, mergemaster is just piping the file through more (or less; not sure which). Mergemaster's already existing -i switch tells it to automatically install any files that don't already exist in the destination directory. To do as you suggest, though, and simply automatically install *everything* would defeat the whole purpose of mergemaster. There are occasions where, due to some new construct or whatever, a large number of files require updating (usually under /etc/rc.d). In that case, it often is easier to simply delete all the existing files under /etc/rc.d and then run mergemaster -i to automatically install the new versions. When such a need arises, it will usually be mentioned in /usr/src/UPDATING (you *do* read that before updating, don't you?). :-) HTH -- Conrad J. Sabatier [EMAIL PROTECTED] -- In Unix veritas /usr/src/UPDATING i would if it had more pictures in it :) can we have a mergemaster -d then who deletes everything. ___ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: mergemaster -i
On Wed, Dec 01, 2004 at 12:06:28PM +0100, Gert Cuykens typed: /usr/src/UPDATING (you *do* read that before updating, don't you?). :-) /usr/src/UPDATING i would if it had more pictures in it :) can we have a mergemaster -d then who deletes everything. write a small shell-script to do this for you: #!/bin/sh for file in `find /usr/src/etc -type f`; do delete=`echo $file | sed 's/\/usr\/src//'` rm -f $delete done have fun! :-) ___ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: mergemaster -i
Gert Cuykens wrote: can someone make a options i install everything so you don't have to push 58 times i enter i enter i enter i enter :) drives me nuts An improvement to this process is hinted at in Gentoo's etc-update script -- it shows you a big list of files, and each has a number. From the readline that follows, you can discard or manually merge numbers 2, 5, 26, and 230, and then have the rest of the list merge automatically, without being prompted. It's practically civilised. chris. ___ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: mergemaster -i
Gert Cuykens wrote: can someone make a options i install everything so you don't have to push 58 times i enter i enter i enter i enter :) drives me nuts especially when you sometimes have to do enter enter enter to scroll down the preview and then accidentally do 1 enter to many Well, make a day of it, grab a cup of Joe, sit back, crank the tunes and have fun. :-D Seriously, though; there is already an i option for mergemaster(8). [535] Tue 30.Nov.2004 17:48:17 [/usr/ports/x11-wm] # man mergemaster | grep -A 2 \-i -i Automatically install any files that do not exist in the des- tination directory. Kevin Kinsey ___ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: mergemaster -i
On Wed, 1 Dec 2004 00:09:13 +0100, Gert Cuykens [EMAIL PROTECTED] wrote: can someone make a options i install everything so you don't have to push 58 times i enter i enter i enter i enter :) drives me nuts especially when you sometimes have to do enter enter enter to scroll down the preview and then accidentally do 1 enter to many You can press q to interrupt the display of a file. After all, mergemaster is just piping the file through more (or less; not sure which). Mergemaster's already existing -i switch tells it to automatically install any files that don't already exist in the destination directory. To do as you suggest, though, and simply automatically install *everything* would defeat the whole purpose of mergemaster. There are occasions where, due to some new construct or whatever, a large number of files require updating (usually under /etc/rc.d). In that case, it often is easier to simply delete all the existing files under /etc/rc.d and then run mergemaster -i to automatically install the new versions. When such a need arises, it will usually be mentioned in /usr/src/UPDATING (you *do* read that before updating, don't you?). :-) HTH -- Conrad J. Sabatier [EMAIL PROTECTED] -- In Unix veritas ___ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: mergemaster fails in single user mode
Erik Norgaard wrote: Hi, I just upgraded to -CURRENT (yesterdays). Everything goes well, I reboot into single user mode, mount all partitions and run 'make installworld' To finish the upgrade I run mergemaster still in single user mode, but this fails with the following output: # /usr/sbin/mergemaster tput: no terminal type specified and no TERM environmental variable. *** The directory specified for the temporary root environment, /var/tmp/temproot, exists. This can be a security risk if untrusted users have access to the system. Use 'd' to delete the old /var/tmp/temproot and continue Use 't' to select a new temporary root directory Use 'e' to exit mergemaster Default is to use /var/tmp/temproot as is How should I deal with this? [Use the existing /var/tmp/temproot] *** Leaving /var/tmp/temproot intact *** Creating the temporary root environment in /var/tmp/temproot *** /var/tmp/temproot ready for use *** Creating and populating directory structure in /var/tmp/temproot mtree -eU -f /usr/src/etc/mtree/BSD.root.dist -p /var/tmp/temproot/ mtree:No such file or directory *** Error code 1 Stop in /usr/src/etc. *** FATAL ERROR: Cannot 'cd' to /usr/src/etc and install files to the temproot environment # Script done on Tue Nov 2 12:08:40 2004 Rebooting into normal multi-user mode, I have no problem running the script. Should I simply not run mergemaster in single user mode? (Anyway, I believe the error to be odd). Cheers, Erik PS: I have had this error before, in june and september with -CURRENT. I was told to run mergemaster in multi-user mode, and that the only time you drop down to single-user mode was to run make installworld and even that was semi-optional. 1: # cd /usr/src 2: # make buildworld make buildkernel make installkernel 3: # reboot 4: briefly test your new kernel. 5: # shutdown now 6: # cd /usr/src 7: # make installworld 8: # reboot 9: login. 10: # mergemaster ___ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: mergemaster fails in single user mode
On 2004-11-02 16:24, Erik Norgaard [EMAIL PROTECTED] wrote: Hi, I just upgraded to -CURRENT (yesterdays). Everything goes well, I reboot into single user mode, mount all partitions and run 'make installworld' To finish the upgrade I run mergemaster still in single user mode, but this fails with the following output: # /usr/sbin/mergemaster tput: no terminal type specified and no TERM environmental variable. Hmmm, AFAIK, this shouldn't happen. Do you have a /.profile file? ___ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: mergemaster fails in single user mode
For the sake of clarity and completeness here is a better step by step guide for upgrading from src: 0: % su 1: # cvsup -g -L 2 foobar-supfile 2: # cd /usr/src 3: # make buildworld make buildkernel make installkernel 4: # reboot 5: Login as root (multi-user mode). 6: Breifly test your new Kernel. 7: # shutdown now 8: Hit the Enter Key. 9: # cd /usr/src 10: # make installworld 11: # reboot 12: login as root (multi-user mode). 13: # mergemaster 14: # shutdown now 15: Hit the Enter Key. 16: # exit ___ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: mergemaster fails in single user mode
Giorgos Keramidas wrote: Hmmm, AFAIK, this shouldn't happen. Do you have a /.profile file? hmm, maybe that explains it, /.profile was missing and created when i ran mergemaster in multiuser mode, so I guess cd failed because my path was empty. (I think I must have deleted it when cleaning up from some other messing arround - DOH!!) Thanks, Erik -- Ph: +34.666334818 web: www.locolomo.org S/MIME Certificate: http://www.locolomo.org/crt/2004071206.crt Subject ID: A9:76:7A:ED:06:95:2B:8D:48:97:CE:F2:3F:42:C8:F2:22:DE:4C:B9 Fingerprint: 4A:E8:63:38:46:F6:9A:5D:B4:DC:29:41:3F:62:D3:0A:73:25:67:C2 ___ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: mergemaster fails in single user mode
On Tuesday 02 November 2004 09:24 am, Erik Norgaard wrote: Hi, I just upgraded to -CURRENT (yesterdays). Everything goes well, I reboot into single user mode, mount all partitions and run 'make installworld' To finish the upgrade I run mergemaster still in single user mode, but this fails with the following output: # /usr/sbin/mergemaster tput: no terminal type specified and no TERM environmental variable. *** The directory specified for the temporary root environment, /var/tmp/temproot, exists. This can be a security risk if untrusted users have access to the system. Use 'd' to delete the old /var/tmp/temproot and continue Use 't' to select a new temporary root directory Use 'e' to exit mergemaster Default is to use /var/tmp/temproot as is How should I deal with this? [Use the existing /var/tmp/temproot] *** Leaving /var/tmp/temproot intact *** Creating the temporary root environment in /var/tmp/temproot *** /var/tmp/temproot ready for use *** Creating and populating directory structure in /var/tmp/temproot mtree -eU -f /usr/src/etc/mtree/BSD.root.dist -p /var/tmp/temproot/ mtree:No such file or directory *** Error code 1 Stop in /usr/src/etc. *** FATAL ERROR: Cannot 'cd' to /usr/src/etc and install files to the temproot environment # Script done on Tue Nov 2 12:08:40 2004 Rebooting into normal multi-user mode, I have no problem running the script. Should I simply not run mergemaster in single user mode? (Anyway, I believe the error to be odd). Cheers, Erik PS: I have had this error before, in june and september with -CURRENT. Hi Erik, The best thing you can do is read /usr/src/UPDATING and follow the procedure for upgrading located towards the end of the file. One thing it will tell you is to run mergemaster -p before going into single-user mode. I didn't see you mention doing that. Instead of rebooting into single-user mode, why don't you do shutdown now, that will put you into single user mode. OK, you want to make buildworld, buildkernel, installkernel while in multiuser mode. When that's done, go to single-user mode, run mergemaster -p. If it asks what to do about an existing /var/tmp/temproot, you want to delete it, it's existing from a previous upgrade and you don't want to use it. Deleating it will allow it to be repopulated. Then, you can cd /usr/src and run make installworld. When that's done, while still in single user mode, you can run mergemaster or mergemaster -i. You will be warned about an existing /var/tmp/temproot. Again, you want to delete it so it can be correctly repopulated. After that, my advice is to just install everything mergemaster puts up to be taken care of. Finally, you can reboot, or shutdown -r now, login as root, and unless you did something strange that you can't remember doing, it should work. Don -- Donald J. O'Neill [EMAIL PROTECTED] ___ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: mergemaster fails in single user mode
On 2004-11-02 18:22, Erik Norgaard [EMAIL PROTECTED] wrote:
Giorgos Keramidas wrote:
Hmmm, AFAIK, this shouldn't happen. Do you have a /.profile file?
hmm, maybe that explains it, /.profile was missing and created when i
ran mergemaster in multiuser mode, so I guess cd failed because my path
was empty.
Because TERM was unset. The default /.profile contains:
TERM=${TERM:-cons25}
export TERM
which makes sure that TERM is set to cons25, unless it's already set to
something else.
I think I must have deleted it when cleaning up from some other
messing arround - DOH!!
Heh. Yeah, that's a very likely scenario.
___
[EMAIL PROTECTED] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: mergemaster: schg flag for temproot/var/emtpy ??
On Sun, Sep 14, 2003 at 06:08:57PM +0900, Rob Lahaye wrote: Is there any reason why it is like that? Yes, it's used to chroot into, and must not be writable. Kris pgp0.pgp Description: PGP signature
Re: mergemaster: schg flag for temproot/var/emtpy ??
Hi, I am trying to learn the buildworld and mergemaster process from the Handbook. The handbook says: [...] To begin simply type mergemaster at your prompt, and watch it start going. [..] SO I did type mergemaster and all went well. Decided then to remove the temproot directory, but failed! # rm -rf /var/tmp/temproot rm: /var/tmp/temproot/var/empty: Operation not permitted rm: /var/tmp/temproot/var: Directory not empty rm: /var/tmp/temproot/: Directory not empty Took me a long while to figure out the /var/tmp/temproot/var/empty direcoty has the schg flag set. Very, very confusing. Is there any reason why it is like that? If not, then do not create the empty directory with schg !! Because /var/empty should not be deleted. Some programs use it. I don't know about that particilar variation. jerry Regards, Rob. ___ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
RE: mergemaster: schg flag for temproot/var/emtpy ??
SO I did type mergemaster and all went well. Decided then to remove the temproot directory, but failed! # rm -rf /var/tmp/temproot rm: /var/tmp/temproot/var/empty: Operation not permitted rm: /var/tmp/temproot/var: Directory not empty rm: /var/tmp/temproot/: Directory not empty Took me a long while to figure out the /var/tmp/temproot/var/empty direcoty has the schg flag set. Very, very confusing. Is there any reason why it is like that? If not, then do not create the empty directory with schg !! Because /var/empty should not be deleted. Some programs use it. I don't know about that particilar variation. I'm confused here, but that's nothing new... I'm running 4.8-RELEASE-p4. I can read what Jerry says, but does he mean that /var/empty should not be deleted, or that /var/tmp/temproot/var/empty should not be deleted? These two directories are completely different, and if I'm rebuilding from source for, say, the second time, then /var/tmp/temproot/var/empty might exist and definitly should be deleted, right? ___ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: mergemaster: schg flag for temproot/var/emtpy ??
On Sun, Sep 14, 2003 at 03:26:43PM -0500, Charles Howse wrote: SO I did type mergemaster and all went well. Decided then to remove the temproot directory, but failed! # rm -rf /var/tmp/temproot rm: /var/tmp/temproot/var/empty: Operation not permitted rm: /var/tmp/temproot/var: Directory not empty rm: /var/tmp/temproot/: Directory not empty Took me a long while to figure out the /var/tmp/temproot/var/empty direcoty has the schg flag set. Very, very confusing. Is there any reason why it is like that? If not, then do not create the empty directory with schg !! Because /var/empty should not be deleted. Some programs use it. I don't know about that particilar variation. I'm confused here, but that's nothing new... I'm running 4.8-RELEASE-p4. I can read what Jerry says, but does he mean that /var/empty should not be deleted, or that /var/tmp/temproot/var/empty should not be deleted? These two directories are completely different, and if I'm rebuilding from source for, say, the second time, then /var/tmp/temproot/var/empty might exist and definitly should be deleted, right? /var/tmp/temproot/var/empty should be deleted by mergemaster along with the rest of temproot. There were some modifications a few months back to enable it to deal with the .../var/empty directory -- essentially it just does a 'rm -rf' to get rid of as much as possible, then a 'chflags -R 0' to de-flag the rest and 'rm -rf' again to finish off the job. Perhaps you have an older version of mergemaster before that capability was added. Anyhow, feel free to zap the contents of /var/tmp/temproot manually. Leave /var/empty alone, unless you've got something against ssh(1) working properly. Cheers, Matthew -- Dr Matthew J Seaman MA, D.Phil. 26 The Paddocks Savill Way PGP: http://www.infracaninophile.co.uk/pgpkey Marlow Tel: +44 1628 476614 Bucks., SL7 1TH UK pgp0.pgp Description: PGP signature
Re: mergemaster fails when building temproot
mergemaster fails saying freebsd.cf does not exist when building temproot. Have I missed something here? You need to install the new version of mergemaster before running it. ___ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: mergemaster fails when building temproot
Thanks, that was it! later Michael On Fri, 2003-09-05 at 13:31, Gregory Neil Shapiro wrote: mergemaster fails saying freebsd.cf does not exist when building temproot. Have I missed something here? You need to install the new version of mergemaster before running it. ___ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: mergemaster clarification
it is precisely because i modified *many* files under /etc (like rc.conf, master.passwd, group, adduser.conf, XF86Config, fstab, gettytab, ttys, and on and on...) that i expected mergemaster to present me with more than just 4 files to compare (which were ppp.conf, motd, csh.cshrc, and one other which i no longer recall). is this the expected behaviour? Take a look through /usr/src/etc. These are the files that will potentially be comapred. As an example, XF86Config isn't part of the base system, it is created by the user and therefore has nothing to be compared to. The main reason for there not being many files compared is probably that few, if any, of these files have changed during the lifespan of the RELENG_4_8. If you were to upgrade to 4.8-STABLE you would probably be presented with several files for merging. [tks for your quick reply, mike.] I'm no expert but I try to help when I can. =) ___ [EMAIL PROTECTED] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: mergemaster question
From: David Banning [EMAIL PROTECTED] To: [EMAIL PROTECTED] Sent: Saturday, October 26, 2002 6:50 PM Subject: mergemaster question I am just in the process of upgrading from 4.5S to 4.7 and I will be running mergemaster. One thing I notice using mergemaster is that it seems to take such a long time. Is there a quicker way? It wants to replace alot of files, and that's OK for me 95% of the time. Only a few I want to keep or merge. Am I missing something, or is it just a part of upgrading that you must decide, file by file which will be modified or replaced? I'm guessing that a) the versatility of FBSD in general and b) the sheer amount of effort involved in keeping up with the entire OS have something to do with this. Seems like it'd be really quite difficult to determine which files _everyone_ would think don't need to be kept or merged. And certainly, you can't depend on everyone to read all the changes themselves. Kevin Kinsey To Unsubscribe: send mail to [EMAIL PROTECTED] with unsubscribe freebsd-questions in the body of the message
Re: mergemaster question
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 (10.26.2002 @ 1650 PST): David Banning said, in 0.5K: I am just in the process of upgrading from 4.5S to 4.7 and I will be running mergemaster. One thing I notice using mergemaster is that it seems to take such a long time. Is there a quicker way? It wants to replace alot of files, and that's OK for me 95% of the time. Only a few I want to keep or merge. Am I missing something, or is it just a part of upgrading that you must decide, file by file which will be modified or replaced? end of mergemaster question from David Banning Nope, you're not missing anything ::) Overwriting system binaries and libraries is the easy part. You don't want an installer overwriting your files in /etc... that's where all the things that make your system what it is live. A good number of files changed from 4.5 to 4.7, but mergemaster shouldn't take a long time... as compared to, say, building world, or even installing world. Unless you've modified lots of stuff, it's perfectly fine to let mergemaster overwrite nearly everything. But it's worth paying attention to: one of the things you'll be needing to merge is /etc/master.passwd. If you let mergemaster overwrite it, you'll lose your users. Also keep in mind that the more time between upgrades, the more files have to be overwritten. Very few /etc files changed from 4.6.2 to 4.7. - -Adam - -- Adam Weinberger [EMAIL PROTECTED] [EMAIL PROTECTED] -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.0 (FreeBSD) iD8DBQE9uzHMo8KM2ULHQ/0RAl3nAKCtoa2XY4h2eJMjZ9YqQOzvZJny1wCgweKb c0EmxMruNeLz0a/FebrkdBs= =4J3t -END PGP SIGNATURE- To Unsubscribe: send mail to [EMAIL PROTECTED] with unsubscribe freebsd-questions in the body of the message
Re: mergemaster question
On Sat, 26 Oct 2002, David Banning wrote:
I am just in the process of upgrading from 4.5S to 4.7 and I will
be running mergemaster.
One thing I notice using mergemaster is that it seems to take such a long
time. Is there a quicker way? It wants to replace alot of files,
and that's OK for me 95% of the time.
Only a few I want to keep or merge.
Am I missing something, or is it just a part of upgrading that you must
decide, file by file which will be modified or replaced?
There will only be a lot of files to update if it has been a long time
since you last rebuilt everything and ran mergemaster.
You can reduce the number of files to check by copying files you know
you have not modified before running mergemaster, e.g.:
cp /usr/src/etc/mtree/* /etc/mtree
cp /usr/src/etc/defaults/* /etc/defaults
cp /usr/src/etc/rc /etc
cp /usr/src/etc/rc.{diskless*,i386,network*} /etc
I think there are hooks in mergemaster that allow you to script some
of this stuff, but I've never gotten around to use them.
$.02,
/Mikko
To Unsubscribe: send mail to [EMAIL PROTECTED]
with unsubscribe freebsd-questions in the body of the message
Re: mergemaster problem
Hi! Date: Tue, 22 Oct 2002 11:57:44 -0700 From: Kent Stewart [EMAIL PROTECTED] Subject: Re: mergemaster problem [... about upgrading the world ...] If they fix a security related buffer overflow problem in one of the system libraries, you need to update all ports that use that library. Isn't that the case only with statically linked binaries? -- Toomas Aas | [EMAIL PROTECTED] | http://www.raad.tartu.ee/~toomas/ * Yes means No and No means Yes. Delete all files [Y]? To Unsubscribe: send mail to [EMAIL PROTECTED] with unsubscribe freebsd-questions in the body of the message
Re: mergemaster problem
At 01:43 PM 10/23/2002 +0300, you wrote: Hi! Date: Tue, 22 Oct 2002 11:57:44 -0700 From: Kent Stewart [EMAIL PROTECTED] Subject: Re: mergemaster problem [... about upgrading the world ...] If they fix a security related buffer overflow problem in one of the system libraries, you need to update all ports that use that library. Isn't that the case only with statically linked binaries? I don't know exactly how that works, but after the upgrade (quite successful) all proggies work fine (I hope). I figure that any further updates to the programs will be taken care of by portupgrade. It always worked for me before :)) PJ To Unsubscribe: send mail to [EMAIL PROTECTED] with unsubscribe freebsd-questions in the body of the message
Re: mergemaster problem
Toomas Aas wrote: Hi! Date: Tue, 22 Oct 2002 11:57:44 -0700 From: Kent Stewart [EMAIL PROTECTED] Subject: Re: mergemaster problem [... about upgrading the world ...] If they fix a security related buffer overflow problem in one of the system libraries, you need to update all ports that use that library. Isn't that the case only with statically linked binaries? Yes! The problem is knowing which method they use. The normal assumption would be dynamic because it is less trouble and can be more efficient with respect to memory usage. The paranoid side of me, which worrys about security, would assume static unless told otherwise. Since I haven't rebuilt all of my old ports, I haven't worried about it too much :). I have never got that involved with a port make file with the exception of Code Crusader and I didn't pay attention to it. The port make files are so much more involved than anything I used on a vendor maintained OS. There was always a generator that you passed a directory and it created the basic make files for me. The first one I created on FreeBSD had 277 modules and was really painful to create. I think I did everything that I could do wrong first. Kent -- Kent Stewart Richland, WA http://users.owt.com/kstewart/index.html To Unsubscribe: send mail to [EMAIL PROTECTED] with unsubscribe freebsd-questions in the body of the message
Re: mergemaster problem
[EMAIL PROTECTED] wrote: I want to upgrade FreeBSD from 4.62 to 4.7 so I can use openoffice. I find the instructions in the handbook incomplete: 21.4 Using make world In trying to use mergemaster, I find it incomprehensible as to what the program actually does and what I am supposed to direct it to do. It is not clear as to what is done with the master.passwd and group files and where they are installed or how they are modified. I tried to be ultra conservative and backed up the /etc/group and /etc/master.passwd files to *.old and then ran mergemaster. It was thereafter not clear who(what process or program) would use the new file (which, where) or how the files would be merged. I chose the 'm' option to merge the files, assuming that the existing passwords, users and groups would be merged into the new file. Then to verify, I entered the 'v' option; but this produced nothing. Thinking that the backups would be insurance, I then opted for 'i'. On exiting mergemaster, I chose to leave the temp files. I did not run the pwd_mkdb -p as suggested until after verifying the /etc directory and the /var/tmp/temproot/etc directories: SURPRISE the /etc/group, /etc/passwd and /etc/master.passwd files are empty. And there is nothintg in the /var/tmp/temproot/etc directory What in the world is going on here? I have not closed down or rebooted as I am afraid that the whole installation will be lshot to hell. What do I do? Will restoring the saved group and master.passwd files do anything? Then there is the empty passwd file. I suppose that running vipw and adduser might fix things... Also, there was no /etc/make.conf file. The installation has been pretty much by the book using portupgrade ... Everything works just fine - Xfree86-4.2; cups, kde3; I just want to upgrade to 4.7 for openoffice. Please help You might read section 21.4.10 Update Files Not Updated by make world of the Handbook. Mergemaster does the compares and produces a list for you to see that represents the diff between your current file and the new one produced by your buildworld. Vipw, for example, will update your password files and also update the password data base. People used to update /dev and not run MAKEDEV when they finished. The result was nothing changed and their system did not have the new devices. Mergemaster knows about most of these programs that need to be run after /etc has been updated and asks you if you want to finish the update. The normal choice is y. If you change the version of sendmail, for example, and don't update the configuration files, you may not have a running sendmail when you have rebooted into your latest version of FreeBSD. My first encounter with mergemaster was, I think, in the FreeBSD-3.1 to 3.2 world. I was trying to follow the transition from one release level to the next. I was also updating /etc manually. They were introducing fixes faster than I could update /etc. Then, I discovered mergemaster and a typical installword session on my fast machines, which includes running mergemaster, requires less than 5 minutes of uptime. It is worth learning how to use it :). I think I am one of the few that won't let mergemaster modify master.passwd, groups, printcap, hosts*, and maybe a couple of other files. When it gets into the merge mode, I feel like I have funnel vision and can't cope with it. So, I read about changes for new users and etc. and add them before I run the buildworld. Some of this you can do with the -p option, but I still prefer looking at the files in 2 windows side by side on a different computer. You can do this from 2 x-window console sessions but I have 2 computers that don't run X and have gotten used to doing this from one central computer. Kent -- Kent Stewart Richland, WA http://users.owt.com/kstewart/index.html To Unsubscribe: send mail to [EMAIL PROTECTED] with unsubscribe freebsd-questions in the body of the message
Re: mergemaster problem
At 10:01 AM 10/22/2002 -0700, you wrote: I must say, as I often have remarked, that the handbook is rather foggy - you often have to read a whole slew of things that are urelated before you get to the main point - I was trying to follow the manual, step by step - but it sure doesn't seem to work quite that way. :(( I did vipw with the restored backed-up files and now I have passwd and will probably be ok. So, as I understand it, I should just run make buildwold from /usr/src, then build the new kernel and then do make installworld, then update the files not updated by make world etc, etc. as in the handbook. That, then, will upgrade my system to 4.7. Right? As I need no changes to the programs I have installed (they're all up-to-date with portupgrade), I should just verify that the /etc/group, passwd and master.passwd files are conforming to the newer version. And this, as I understand, can be done by the mergemaster. Thanks much. PJ To Unsubscribe: send mail to [EMAIL PROTECTED] with unsubscribe freebsd-questions in the body of the message
Re: mergemaster problem
[EMAIL PROTECTED] wrote: At 10:01 AM 10/22/2002 -0700, you wrote: I must say, as I often have remarked, that the handbook is rather foggy - you often have to read a whole slew of things that are urelated before you get to the main point - I was trying to follow the manual, step by step - but it sure doesn't seem to work quite that way. :(( Part of the problem with the Handbook is that it covers most of the versions. I did vipw with the restored backed-up files and now I have passwd and will probably be ok. So, as I understand it, I should just run make buildwold from /usr/src, then build the new kernel and then do make installworld, then update the files not updated by make world etc, etc. as in the handbook. That, then, will upgrade my system to 4.7. Right? After you have installed the kernel, installed the world, and run mergemaster, you have the current release. Many people don't reboot into single user mode. I always do that. I want to know the kernel works before I do the installworld. I could probably exit from single user mode after I ran mergemaster but I do a reboot at that point. If I have added some new devices, I want the kernel to see them. As I need no changes to the programs I have installed (they're all up-to-date with portupgrade), I should just verify that the /etc/group, passwd and master.passwd files are conforming to the newer version. And this, as I understand, can be done by the mergemaster. I don't use mergemaster to update master.passwd but I do copy the header info from the location in /usr/tmp and insert it into the files I modify by hand. Once you have rebooted and are running the new version, you can run mergemaster again and it will tell you what files it wants to update. Some of that is results from a comparison of the cvs header information. You can make mergemaster ignore that file by updating the header information. I use information from mergemaster to update them manually. It tells you where all of the files are located and that makes it really easy to upgrade a file manually. If you have port programs that depend on system libraries, you need to rebuild the ports so they link to the new version. This is not always important. The port lsof is an exception that comes to mind. It knows when you have updated the system and not rebuilt lsof. It tells you about this everytime you run it. If they fix a security related buffer overflow problem in one of the system libraries, you need to update all ports that use that library. I haven't seen announcents that cover this kind of problem. I don't know if this is a problem. I know I have gone more than a release on some of my ports. Whether I should have rebuilt some of them was something I do not know. Some people do level upgrades by doing clean installs. They wipe the disks and reinstall everything. I use cvsup to follow RELENG_4 and know I have some old stuff still available. Portupgrade makes some of this really simple. It is sort of the mergemaster of the port world. I do a portsdb -uU after every cvsup of ports-all. There are programs that tell you what is out of date on your system. I just finished checking 4 machines and making sure they were all running the latest versions of the ports. I didn't rebuild everything. Keeping your ports current is important. The question is one of timing and I don't have an answer to that. I have started building packages as part of the make install. Checking the date in /usr/ports/packages/All will tell me which ports I haven't updated for a long time. The ones I use very often are also updated often. Kent -- Kent Stewart Richland, WA http://users.owt.com/kstewart/index.html To Unsubscribe: send mail to [EMAIL PROTECTED] with unsubscribe freebsd-questions in the body of the message
Re: mergemaster problem
I chanced it and it looks like it all worked. mergemaster seems to have worked ok. I was too lazy to do things manually. V. 4.7 booted up ok. Now to see if there are any quirks I have to fix. Thanks very much for your help. PJ. To Unsubscribe: send mail to [EMAIL PROTECTED] with unsubscribe freebsd-questions in the body of the message
