mergemaster (was: Congratulations on the stable/13 release!)
* Andrew Reilly [20210501 11:45]:
> mergemaster -p
> make -s installworld
> mergemaster -U
Note you shouldn't use mergemaster any more. It works fine for upgrading
to 13, but after that, I'd expect problems because it relies on the old
VCS tags. Use etcupdate instead, see here for details:
<https://bugs.freebsd.org/252417>
It's also documented in the handbook:
<https://docs.freebsd.org/en/books/handbook/cutting-edge/#makeworld>
--
Dipl.-Inform. Felix Palmen ,.//..
{web} http://palmen-it.de {jabber} [see email] ,//palmen-it.de
{pgp public key} http://palmen-it.de/pub.txt // """""""""""
{pgp fingerprint} A891 3D55 5F2E 3A74 3965 B997 3EF2 8B0A BC02 DA2A
signature.asc
Description: PGP signature
mergemaster and etcupdate
Hi, I've used mergemaster for years like this: 1. mergemaster -p after the make installkernel step 2. mergemaster -Ui after the make installworld step Although I've seen nothing announced making etcupdate mandatory, I guess etcupdate will be the new way of doing things. My questions are: [a] what are the etcupdate equivalents of the above mergemaster commands? [b] do I need to do any prep before running make buildworld, or with any other step in the buildworld/installworld process? [c] when will mergemaster stop working? context: amd64 stable/13 thanks, -- J. signature.asc Description: PGP signature
Re: git, $FreeBSD$ and mergemaster
W dniu 24.12.2020 o 03:01, Jonathan Chen pisze: > Hi, > > With the transition to git, I'm now getting a lot of prompts for > differences against an empty $FreeBSD$, eg: > > *** Displaying differences between installed version and ./.cshrc: > > --- /.cshrc 2020-09-03 19:14:19.258107000 +1200 > +++ ./.cshrc2020-12-24 14:52:16.751245000 +1300 > @@ -1,4 +1,4 @@ > -# $FreeBSD: stable/12/bin/csh/dot.cshrc 363525 2020-07-25 11:57:39Z pstef $ > +# $FreeBSD$ > # > # .cshrc - csh resource script, read at beginning of execution by each shell > # > > While I can simply run a "mergemaster -F" to get past this particular > update, how will mergemaster operate in the future when there are > changes in /etc if it can't inspect the $FreeBSD$ tag anymore? > > Cheers. > We can still make use of these $FreeBSD$ tags with Git clean and smudge filters.[1] This will help to keep the track of files updated by mergemaster(8) or etcupdate(8). The whole work can be done at user/administrator level. No need to bother committers, core@, re@ etc. Apparently, neither mergemaster nor etcupdate really needs these $FreeBSD$ tags, but we still _have_ them[2]. The ongoing discussion about removing them makes me really anxious, why not use them to make something profitable at the user level. I have done some tests with clean/smudge on stable/12 and head branches and I find these tags really useful after the transition to Git. With a bit modified scripts from Git documentation examples[1] it is possible to regenerate these tags for example in the following form: # $FreeBSD: 7d69f46f647 g...@freebsd.org Sat Dec 19 09:55:02 2020 +$ When the build system utilizes the same local Git repository configured for builds, then the tags will be updated only with new commits regarding tagged files. However, the info provided in them can be misleading, especially after recreation of local repository and initial checkout or after running "git gc" in the repo. Anyway, it _can_ really help the administrator to keep track of files updated by mergemaster or etcupdate. [1] https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes [2] https://lists.freebsd.org/pipermail/dev-commits-src-all/2020-December/000369.html Regards, -- Marek Zarychta OpenPGP_signature Description: OpenPGP digital signature
Re: git, $FreeBSD$ and mergemaster
On Wed, Dec 30, 2020 at 05:07:19PM +0100, Ulrich Spörlein wrote: > ... > >> However, wouldn't this mean that every run of "mergemaster" would > >> prompt for local changes? The nice thing about using the $FreeBSD$ > >> tags was that if I approved a local-change, subsequent runs of > >> mergemaster would not prompt me about the local-change unless the > >> etc-file had been modified in the source tree. > >> > >> Cheers. > >> -- > >> Jonathan Chen > >> > > > >Indeed: the above-described behavior is what I have observed so far > >since the transition (tracking head & stable/12 daily on two machines). > > > >I would go a bit further than stating that the prior behavior was > >"nice." > > The only way forward is full git! Provide the /etc equivalent in a git > branch or subdir, then check it out to /etc and handle local changes > with git rebase or git merge. > > (I'm not even joking! :) > After more-or-less coping with the above, I switched from mergemaster to etcupdate this morning. That avoids the issue. Perhaps src/UPDATING's "COMMON ITEMS"/"To rebuild everything and install it on the current system." (et al.) might merit an update? (It cites "mergemaster," but not "etcupdate.") Peace, david -- David H. Wolfskill da...@catwhisker.org While Trump successfully conned a lot of people for a while, in the end he's just a failure throwing a temper tantrum because he lost. See https://www.catwhisker.org/~david/publickey.gpg for my public key. signature.asc Description: PGP signature
Re: git, $FreeBSD$ and mergemaster
On Fri, 2020-12-25 at 04:18:22 -0800, David Wolfskill wrote: On Fri, Dec 25, 2020 at 10:00:57PM +1300, Jonathan Chen wrote: Hi Kyle, On Thu, 24 Dec 2020 at 15:05, Kyle Evans wrote: ... > mergemaster only uses it as an optimization, if they're unexpanded > throughout then it falls back to diff(1) -- i.e. it's slower without. Thanks for the answer. However, wouldn't this mean that every run of "mergemaster" would prompt for local changes? The nice thing about using the $FreeBSD$ tags was that if I approved a local-change, subsequent runs of mergemaster would not prompt me about the local-change unless the etc-file had been modified in the source tree. Cheers. -- Jonathan Chen Indeed: the above-described behavior is what I have observed so far since the transition (tracking head & stable/12 daily on two machines). I would go a bit further than stating that the prior behavior was "nice." The only way forward is full git! Provide the /etc equivalent in a git branch or subdir, then check it out to /etc and handle local changes with git rebase or git merge. (I'm not even joking! :) Cheers Uli ___ freebsd-stable@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to "freebsd-stable-unsubscr...@freebsd.org"
Re: git, $FreeBSD$ and mergemaster
On Fri, Dec 25, 2020 at 10:00:57PM +1300, Jonathan Chen wrote: > Hi Kyle, > > On Thu, 24 Dec 2020 at 15:05, Kyle Evans wrote: > ... > > mergemaster only uses it as an optimization, if they're unexpanded > > throughout then it falls back to diff(1) -- i.e. it's slower without. > > Thanks for the answer. > > However, wouldn't this mean that every run of "mergemaster" would > prompt for local changes? The nice thing about using the $FreeBSD$ > tags was that if I approved a local-change, subsequent runs of > mergemaster would not prompt me about the local-change unless the > etc-file had been modified in the source tree. > > Cheers. > -- > Jonathan Chen > Indeed: the above-described behavior is what I have observed so far since the transition (tracking head & stable/12 daily on two machines). I would go a bit further than stating that the prior behavior was "nice." Peace, david -- David H. Wolfskill da...@catwhisker.org "Dismissing reality doesn't make it go away." - Rajiv Shah, Rockefeller Foundation president See https://www.catwhisker.org/~david/publickey.gpg for my public key. signature.asc Description: PGP signature
Re: git, $FreeBSD$ and mergemaster
Hi Kyle, On Thu, 24 Dec 2020 at 15:05, Kyle Evans wrote: > > On Wed, Dec 23, 2020 at 8:02 PM Jonathan Chen wrote: > > > > Hi, > > > > With the transition to git, I'm now getting a lot of prompts for > > differences against an empty $FreeBSD$, eg: > > > > *** Displaying differences between installed version and ./.cshrc: > > > > --- /.cshrc 2020-09-03 19:14:19.258107000 +1200 > > +++ ./.cshrc2020-12-24 14:52:16.751245000 +1300 > > @@ -1,4 +1,4 @@ > > -# $FreeBSD: stable/12/bin/csh/dot.cshrc 363525 2020-07-25 11:57:39Z pstef $ > > +# $FreeBSD$ > > # > > # .cshrc - csh resource script, read at beginning of execution by each > > shell > > # > > > > While I can simply run a "mergemaster -F" to get past this particular > > update, how will mergemaster operate in the future when there are > > changes in /etc if it can't inspect the $FreeBSD$ tag anymore? > > > > mergemaster only uses it as an optimization, if they're unexpanded > throughout then it falls back to diff(1) -- i.e. it's slower without. Thanks for the answer. However, wouldn't this mean that every run of "mergemaster" would prompt for local changes? The nice thing about using the $FreeBSD$ tags was that if I approved a local-change, subsequent runs of mergemaster would not prompt me about the local-change unless the etc-file had been modified in the source tree. Cheers. -- Jonathan Chen ___ freebsd-stable@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to "freebsd-stable-unsubscr...@freebsd.org"
Re: git, $FreeBSD$ and mergemaster
> On Dec 23, 2020, at 9:04 PM, Kyle Evans wrote: > > On Wed, Dec 23, 2020 at 8:02 PM Jonathan Chen wrote: >> >> Hi, >> >> With the transition to git, I'm now getting a lot of prompts for >> differences against an empty $FreeBSD$, eg: >> >> *** Displaying differences between installed version and ./.cshrc: >> >> --- /.cshrc 2020-09-03 19:14:19.258107000 +1200 >> +++ ./.cshrc2020-12-24 14:52:16.751245000 +1300 >> @@ -1,4 +1,4 @@ >> -# $FreeBSD: stable/12/bin/csh/dot.cshrc 363525 2020-07-25 11:57:39Z pstef $ >> +# $FreeBSD$ >> # >> # .cshrc - csh resource script, read at beginning of execution by each shell >> # >> >> While I can simply run a "mergemaster -F" to get past this particular >> update, how will mergemaster operate in the future when there are >> changes in /etc if it can't inspect the $FreeBSD$ tag anymore? >> > > mergemaster only uses it as an optimization, if they're unexpanded > throughout then it falls back to diff(1) -- i.e. it's slower without. Is this a permanent change with git? I’d miss being able to see a path, date and some indication of revision in config files and anything else that’s text-based. Charles > Thanks, > > Kyle Evans > ___ > freebsd-stable@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-stable > To unsubscribe, send any mail to "freebsd-stable-unsubscr...@freebsd.org" ___ freebsd-stable@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to "freebsd-stable-unsubscr...@freebsd.org"
Re: git, $FreeBSD$ and mergemaster
On Wed, Dec 23, 2020 at 8:02 PM Jonathan Chen wrote: > > Hi, > > With the transition to git, I'm now getting a lot of prompts for > differences against an empty $FreeBSD$, eg: > > *** Displaying differences between installed version and ./.cshrc: > > --- /.cshrc 2020-09-03 19:14:19.258107000 +1200 > +++ ./.cshrc2020-12-24 14:52:16.751245000 +1300 > @@ -1,4 +1,4 @@ > -# $FreeBSD: stable/12/bin/csh/dot.cshrc 363525 2020-07-25 11:57:39Z pstef $ > +# $FreeBSD$ > # > # .cshrc - csh resource script, read at beginning of execution by each shell > # > > While I can simply run a "mergemaster -F" to get past this particular > update, how will mergemaster operate in the future when there are > changes in /etc if it can't inspect the $FreeBSD$ tag anymore? > mergemaster only uses it as an optimization, if they're unexpanded throughout then it falls back to diff(1) -- i.e. it's slower without. Thanks, Kyle Evans ___ freebsd-stable@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to "freebsd-stable-unsubscr...@freebsd.org"
git, $FreeBSD$ and mergemaster
Hi, With the transition to git, I'm now getting a lot of prompts for differences against an empty $FreeBSD$, eg: *** Displaying differences between installed version and ./.cshrc: --- /.cshrc 2020-09-03 19:14:19.258107000 +1200 +++ ./.cshrc2020-12-24 14:52:16.751245000 +1300 @@ -1,4 +1,4 @@ -# $FreeBSD: stable/12/bin/csh/dot.cshrc 363525 2020-07-25 11:57:39Z pstef $ +# $FreeBSD$ # # .cshrc - csh resource script, read at beginning of execution by each shell # While I can simply run a "mergemaster -F" to get past this particular update, how will mergemaster operate in the future when there are changes in /etc if it can't inspect the $FreeBSD$ tag anymore? Cheers. -- Jonathan Chen ___ freebsd-stable@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to "freebsd-stable-unsubscr...@freebsd.org"
Re: mergemaster whines "... can't install files to the temproot environment"
On Sun, Aug 02, 2020 at 12:20:24PM -0700, David Wolfskill wrote: > Never mind I invoke the "make" command manually; I had an out-of-date (sendmail) *.cf file, which was on a read-only file system. Peace, david -- David H. Wolfskill da...@catwhisker.org Spare Trump from four more years of whining "Nobody likes me" -- support Biden. See http://www.catwhisker.org/~david/publickey.gpg for my public key. signature.asc Description: PGP signature
mergemaster whines "... can't install files to the temproot environment"
I have been updating my home "production" machines weekly for the past 5
years, tracking stable (/12, at present). I mount /usr/src and /usr/obj
via NFS from a dedicated build machine, "make install..." on each
"client" machine (to a fresh copy of the currently-=booted slice), then
reboot from the just-updated slice.
This has been working very well -- until today.
This morning, on one machine (but not the others), the steps up to (and
including):
make installworld DESTDIR=/S1
seem to work OK, but then
mergemaster -F -U -u 0022 -i -D /S1
fails:
...
install -s -o root -g wheel -m 555 ldd32 /S1/usr/bin/ldd32
--
>>> Installing everything completed on Sun Aug 2 18:56:41 UTC 2020
--
*** Creating the temporary root environment in /var/tmp/temproot
*** /var/tmp/temproot ready for use
*** Creating and populating directory structure in /var/tmp/temproot
*** FATAL ERROR: Cannot 'cd' to /usr/src and install files to
the temproot environment
I tried running mergemaster via "sh -x" and found that it is at line 663
that it's failing, so it got through:
${MM_MAKE} DESTDIR=${DESTDIR} distrib-dirs >/dev/null
${MM_MAKE} DESTDIR=${TEMPROOT} distrib-dirs >/dev/null &&
${MM_MAKE} _obj SUBDIR_OVERRIDE=etc >/dev/null &&
and then at
${MM_MAKE} everything SUBDIR_OVERRIDE=etc >/dev/null &&
progress comes to a screeching halt.
/usr/src and /usr/obj are (still) mounted (read-only)), and I keep
clocks in sync.
mergemaster's Id string is:
# $FreeBSD: stable/12/usr.sbin/mergemaster/mergemaster.sh 357082 2020-01-24
15:29:33Z kevans $
The client macxhine in question is running:
bats(12.1-S)[4] uname -aUK
FreeBSD bats.catwhisker.org 12.1-STABLE FreeBSD 12.1-STABLE #619
r363556M/363556: Sun Jul 26 04:29:59 PDT 2020
r...@freebeast.catwhisker.org:/common/S1/obj/usr/src/amd64.amd64/sys/BATS
amd64 1201520 1201520
The build machine is running:
freebeast(12.1-S)[1] uname -aUK
FreeBSD freebeast.catwhisker.org 12.1-STABLE FreeBSD 12.1-STABLE #976
r363768M/363769: Sun Aug 2 03:48:48 PDT 2020
r...@freebeast.catwhisker.org:/common/S1/obj/usr/src/amd64.amd64/sys/GENERIC
amd64 1201520 1201520
(and thus, the client machine is trying to update from r363556 to r363768).
I see no (other) messages logged at the point of failure (checking for
reported disk errors, for example).
Any hints, clues, or suggestions?
Thanks!
Peace,
david
--
David H. Wolfskill da...@catwhisker.org
Spare Trump from four more years of whining "Nobody likes me" -- support Biden.
See http://www.catwhisker.org/~david/publickey.gpg for my public key.
signature.asc
Description: PGP signature
Re: mergemaster woes at STABLE
Chris H <bsd-li...@bsdforge.com> wrote: > > On Fri, 15 Jan 2016 17:38:05 +0100 Michael Grimm <trash...@odo.in-berlin.de> > wrote >> starting a couple of weeks ago, I do see mergemaster complaining after >> "mergemaster -iFU": >> >>stat: ./have: stat: No such file or directory >>/usr/sbin/mergemaster: arithmetic expression: expecting primary: " ~18 & >> 4095 & >> " >>install: invalid file mode: ./have >>*** FATAL ERROR: Unable to install ./have to / >> >> This is on two different servers running 10.2-STABLE (r293911). I couldn't >> find similar reports at google, but I might have missend something. >> >> Any idea where to look for? > Just a hunch; but looks like an unterminated quote -- > ", or ' without the closing ", or ' Well, during compilation and installing of world and kernel it happened somehow, that the following directory had been installed in /var/tmp/temproot: root> ls -al /var/tmp/temproot -rw-r--r-- 1 root wheel uarch 11603 Dec 8 20:52 have been build: No wonder, that mergemaster complains about "./have". Thanks and regards, Michael ___ freebsd-stable@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to "freebsd-stable-unsubscr...@freebsd.org"
Re: mergemaster woes at STABLE
On Fri, 15 Jan 2016 17:38:05 +0100 Michael Grimm <trash...@odo.in-berlin.de> wrote > Hi, > > starting a couple of weeks ago, I do see mergemaster complaining after > "mergemaster -iFU": > > stat: ./have: stat: No such file or directory > /usr/sbin/mergemaster: arithmetic expression: expecting primary: " ~18 & > 4095 & " > install: invalid file mode: ./have > *** FATAL ERROR: Unable to install ./have to / > > This is on two different servers running 10.2-STABLE (r293911). I couldn't > find similar reports at google, but I might have missend something. > > Any idea where to look for? Just a hunch; but looks like an unterminated quote -- ", or ' without the closing ", or ' --Chris > > Thanks and regards, > Michael > ___ freebsd-stable@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to "freebsd-stable-unsubscr...@freebsd.org"
mergemaster woes at STABLE
Hi, starting a couple of weeks ago, I do see mergemaster complaining after "mergemaster -iFU": stat: ./have: stat: No such file or directory /usr/sbin/mergemaster: arithmetic expression: expecting primary: " ~18 & 4095 & " install: invalid file mode: ./have *** FATAL ERROR: Unable to install ./have to / This is on two different servers running 10.2-STABLE (r293911). I couldn't find similar reports at google, but I might have missend something. Any idea where to look for? Thanks and regards, Michael ___ freebsd-stable@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to "freebsd-stable-unsubscr...@freebsd.org"
Pass IGNORE_FILES to mergemaster in commandline
Hi all, How should I update config files in jails? I've always did it by running: IGNORE_FILES='/boot/device.hints /etc/motd' mergemaster -PFUi -D /path/to/jail Now I'm getting *** FATAL ERROR: Unable to install ./boot/device.hints to /path/to/jail/boot, so I assume that IGNORE_FILES is not used anymore. I know, that the manual says that IGNORE_FILES can't be overridden from commandline, but it worked. And it was good :) I'd rather not want to go edit /etc/mergemaster.rc road, because I tend to forget to change it back to defaults and it bitten me hard in the past. -- best regards, Lukasz Wasikowski ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: Pass IGNORE_FILES to mergemaster in commandline
Am 01.10.2013 um 17:56 schrieb Łukasz Wąsikowski: Hi all, How should I update config files in jails? I've always did it by running: IGNORE_FILES='/boot/device.hints /etc/motd' mergemaster -PFUi -D /path/to/jail Now I'm getting *** FATAL ERROR: Unable to install ./boot/device.hints to /path/to/jail/boot, so I assume that IGNORE_FILES is not used anymore. I know, that the manual says that IGNORE_FILES can't be overridden from commandline, but it worked. And it was good :) I'd rather not want to go edit /etc/mergemaster.rc road, because I tend to forget to change it back to defaults and it bitten me hard in the past. Hi. Putting e.g. IGNORE_FILES='/boot/device.hints /etc/motd /etc/hosts' in /etc/mergemaster.rc worked for me with 9.2-STABLE --Kai. -- GPG-Key: A593 E38B E968 4DBE 14D6 2115 7065 4D7C 4FB1 F588 Key available from hkps://hkps.pool.sks-keyservers.net PGP.sig Description: Signierter Teil der Nachricht
Re: Pass IGNORE_FILES to mergemaster in commandline
W dniu 2013-10-01 21:39, Kai Gallasch pisze: Am 01.10.2013 um 17:56 schrieb Łukasz Wąsikowski: Hi all, How should I update config files in jails? I've always did it by running: IGNORE_FILES='/boot/device.hints /etc/motd' mergemaster -PFUi -D /path/to/jail Now I'm getting *** FATAL ERROR: Unable to install ./boot/device.hints to /path/to/jail/boot, so I assume that IGNORE_FILES is not used anymore. I know, that the manual says that IGNORE_FILES can't be overridden from commandline, but it worked. And it was good :) I'd rather not want to go edit /etc/mergemaster.rc road, because I tend to forget to change it back to defaults and it bitten me hard in the past. Hi. Putting e.g. IGNORE_FILES='/boot/device.hints /etc/motd /etc/hosts' in /etc/mergemaster.rc worked for me with 9.2-STABLE I know that putting it in /etc/mergemaster.rc works, I wrote that I don't want to go this road because it's error prone - I forgot once to remove it from mergemaster.rc and ended with unbootable system during next update of the host. Switching this from commandline would be great, and it was working until 9.2-RELEASE. -- best regards, Lukasz Wasikowski ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Problem using mergemaster for 10-alpha
I have setup a few machines in the past from CD installer and my current
machine started with CD install and was then updated from source.
Currently my machine runs 9.1-RELEASE-p3
Yesterday I started to setup a clean 10.0 install onto a new drive that
I can boot from to test ports building with, but had trouble running
mergemaster to get the config files into place. I manually copied the
/etc files from /var/tmp/temproot to get the system running.
The steps I used are based on the handbook upgrade steps but I don't
see any variations to do a clean install from source (I created empty
src.conf and make.conf to prevent using my current files) -
setenv TOPDIR ~/Projects/f10-test
setenv TMPTESTROOT /mnt
setenv MAKEOBJDIRPREFIX ${TOPDIR}/obj
cd ${TOPDIR}
svn co svn://svn0.us-west.FreeBSD.org/base/head src
touch make.conf
touch src.conf
setenv __MAKE_CONF ${TOPDIR}/make.conf
setenv SRCCONF ${TOPDIR}/src.conf
cd ${TOPDIR}/src
make -j4 buildworld
make -j4 buildkernel
mount /dev/da4p3 ${TMPTESTROOT}
make installkernel DESTDIR=${TMPTESTROOT}
mergemaster -p -a -m ${TOPDIR}/src -D ${TMPTESTROOT}
make installworld DESTDIR=${TMPTESTROOT}
mergemaster -a -m ${TOPDIR}/src -D ${TMPTESTROOT}
When using mergemaster with -a I get the following error
*** Creating the temporary root environment in /var/tmp/temproot
*** /var/tmp/temproot ready for use
*** Creating and populating directory structure in /var/tmp/temproot
install: illegal option -- l
usage: install [-bCcMpSsv] [-B suffix] [-f flags] [-g group] [-m mode]
[-o owner] file1 file2
install [-bCcMpSsv] [-B suffix] [-f flags] [-g group] [-m mode]
[-o owner] file1 ... fileN directory
install -d [-v] [-g group] [-m mode] [-o owner] directory ...
*** FATAL ERROR: Cannot 'cd' to /home/shane/Projects/f10-test/src and
install files to
the temproot environment
___
freebsd-stable@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-stable
To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: Problem using mergemaster for 10-alpha
On Fri, Sep 20, 2013 at 03:38:17PM +0930, Shane Ambler wrote:
I have setup a few machines in the past from CD installer and my current
machine started with CD install and was then updated from source.
Currently my machine runs 9.1-RELEASE-p3
Yesterday I started to setup a clean 10.0 install onto a new drive that
I can boot from to test ports building with, but had trouble running
mergemaster to get the config files into place. I manually copied the
/etc files from /var/tmp/temproot to get the system running.
The steps I used are based on the handbook upgrade steps but I don't
see any variations to do a clean install from source (I created empty
src.conf and make.conf to prevent using my current files) -
setenv TOPDIR ~/Projects/f10-test
setenv TMPTESTROOT /mnt
setenv MAKEOBJDIRPREFIX ${TOPDIR}/obj
cd ${TOPDIR}
svn co svn://svn0.us-west.FreeBSD.org/base/head src
touch make.conf
touch src.conf
setenv __MAKE_CONF ${TOPDIR}/make.conf
setenv SRCCONF ${TOPDIR}/src.conf
cd ${TOPDIR}/src
make -j4 buildworld
make -j4 buildkernel
mount /dev/da4p3 ${TMPTESTROOT}
make installkernel DESTDIR=${TMPTESTROOT}
mergemaster -p -a -m ${TOPDIR}/src -D ${TMPTESTROOT}
make installworld DESTDIR=${TMPTESTROOT}
mergemaster -a -m ${TOPDIR}/src -D ${TMPTESTROOT}
When using mergemaster with -a I get the following error
*** Creating the temporary root environment in /var/tmp/temproot
*** /var/tmp/temproot ready for use
*** Creating and populating directory structure in /var/tmp/temproot
install: illegal option -- l
usage: install [-bCcMpSsv] [-B suffix] [-f flags] [-g group] [-m mode]
[-o owner] file1 file2
install [-bCcMpSsv] [-B suffix] [-f flags] [-g group] [-m mode]
[-o owner] file1 ... fileN directory
install -d [-v] [-g group] [-m mode] [-o owner] directory ...
*** FATAL ERROR: Cannot 'cd' to /home/shane/Projects/f10-test/src and
install files to
the temproot environment
See /usr/src/UPDATING entry 20130425
___
freebsd-stable@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-stable
To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
pgpIPRopjCqsN.pgp
Description: PGP signature
Re: Problem using mergemaster for 10-alpha
On 20/09/2013 19:39, Bryan Drewery wrote: On Fri, Sep 20, 2013 at 03:38:17PM +0930, Shane Ambler wrote: When using mergemaster with -a I get the following error *** Creating the temporary root environment in /var/tmp/temproot *** /var/tmp/temproot ready for use *** Creating and populating directory structure in /var/tmp/temproot install: illegal option -- l *** FATAL ERROR: Cannot 'cd' to /home/shane/Projects/f10-test/src and install files to the temproot environment See /usr/src/UPDATING entry 20130425 UPDATING describes mergemster -p as the issue and installing the new version as a fix. The new version fixes the fatal error above but it doesn't honour the -D option so doesn't install anything into /mnt still leaving me with manually copying from temproot. ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
9.1-stable mergemaster -D fails
running 9.1-STABLE r247548 updating to 9.1-STABLE r248381 When updating to the new version in a zfs beadm environment, mergemaster -D /mnt fails with install: illegal option -- l install (1) in the new version has an added -l switch which is used in bsd.own.mk which in turn is used by mergemaster. Making mergemaster use the new install(1) fixes the problem. John Theus TheUsGroup.com ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: mergemaster -p / installkernel problem
What did you have in your mergemaster.rc ? To help next people who may have the same problem :) 2013/1/28 Michiel Boland bolan...@xs4all.nl On 01/28/2013 02:10, Kevin Oberman wrote: You don't by any chance have a mergemaster.rc in /etc or .mergemasterrc in $HOME? Duh... I'll go stand in the corner for the next 37 years. Cheers Michiel __**_ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/**mailman/listinfo/freebsd-**stablehttp://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscribe@**freebsd.orgfreebsd-stable-unsubscr...@freebsd.org -- Demelier David ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: mergemaster -p / installkernel problem
On 01/28/2013 13:59, David Demelier wrote: What did you have in your mergemaster.rc ? To help next people who may have the same problem :) The mergemaster.rc that caused the problem has this IGNORE_FILES='/etc/group /etc/hosts.allow /etc/mail/* /etc/master.passwd /etc/motd /etc/passwd /etc/sysctl.conf /etc/ttys /etc/namedb/*' Obviously ignoring /etc/master.passwd et al isn't a good idea if you want to upgrade. Maybe there could be a warning added to mergemaster -p if it would skip essential steps because of IGNORE_FILES. (Then at least some good can come out of this. :) Cheers Michiel ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
mergemaster -p / installkernel problem
# mergemaster -p *** Creating the temporary root environment in /var/tmp/temproot *** /var/tmp/temproot ready for use *** Creating and populating directory structure in /var/tmp/temproot *** Beginning comparison *** Comparison complete *** /var/tmp/temproot is empty, deleting # make installkernel ERROR: Required auditdistd user is missing, see /usr/src/UPDATING. *** [installcheck_UGID] Error code 1 Stop in /usr/src. *** [installkernel] Error code 1 Stop in /usr/src. Why doesn't mergemaster find the updated master.password file? # grep FreeBSD /etc/master.passwd # $FreeBSD: stable/9/etc/master.passwd 218047 2011-01-28 22:29:38Z pjd $ # grep FreeBSD /usr/src/etc/master.passwd # $FreeBSD: stable/9/etc/master.passwd 243947 2012-12-06 11:52:31Z rwatson $ ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: mergemaster -p / installkernel problem
On Sun, Jan 27, 2013 at 11:18 AM, Michiel Boland bolan...@xs4all.nl wrote: # mergemaster -p *** Creating the temporary root environment in /var/tmp/temproot *** /var/tmp/temproot ready for use *** Creating and populating directory structure in /var/tmp/temproot *** Beginning comparison *** Comparison complete *** /var/tmp/temproot is empty, deleting # make installkernel ERROR: Required auditdistd user is missing, see /usr/src/UPDATING. *** [installcheck_UGID] Error code 1 Stop in /usr/src. *** [installkernel] Error code 1 Stop in /usr/src. Why doesn't mergemaster find the updated master.password file? # grep FreeBSD /etc/master.passwd # $FreeBSD: stable/9/etc/master.passwd 218047 2011-01-28 22:29:38Z pjd $ # grep FreeBSD /usr/src/etc/master.passwd # $FreeBSD: stable/9/etc/master.passwd 243947 2012-12-06 11:52:31Z rwatson $ If you 'grep auditdistd /usr/src/etc/master.passwd', does is it there? I have the same version and auditdistd is there, and mergemaster -p did catch it. You don't by any chance have a mergemaster.rc in /etc or .mergemasterrc in $HOME? -- R. Kevin Oberman, Network Engineer E-mail: kob6...@gmail.com ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: mergemaster -p / installkernel problem
On 01/28/2013 02:10, Kevin Oberman wrote: You don't by any chance have a mergemaster.rc in /etc or .mergemasterrc in $HOME? Duh... I'll go stand in the corner for the next 37 years. Cheers Michiel ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: freebsd-update mergemaster options
I am getting hundreds of files with conflicts like: current version # $FreeBSD: src/etc/auth.conf,v 1.6.32.1.4.1 2010/06/14 02:09:06 kensmith Exp $ === # $FreeBSD: src/etc/auth.conf,v 1.6.32.1.8.1 2012/03/03 06:15:13 kensmith Exp $ 8.3-RELEASE mergemaster took the master part of its name a bit seriously i use -cviFU randy ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
freebsd-update mergemaster options
Hi, On an 8.2 box, I run freebsd-update -r 8.3-RELEASE upgrade I am getting hundreds of files with conflicts like: current version # $FreeBSD: src/etc/auth.conf,v 1.6.32.1.4.1 2010/06/14 02:09:06 kensmith Exp $ === # $FreeBSD: src/etc/auth.conf,v 1.6.32.1.8.1 2012/03/03 06:15:13 kensmith Exp $ 8.3-RELEASE ... which is just tremendously unhelpful. I'm using the default freebsd-update configuration. Per an old mail from the archives I made sure I have /etc/mergemaster.rc setup as below, but it doesn't seem to make a difference. Any ideas? In the past I've just given up on using freebsd-update and gone back to manually compiling and installing world, but for this box I'd really like not to. Ask $ cat /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:.*[$]' ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: freebsd-update mergemaster options
On 12/11/2012 12:58 AM, Ask Bjørn Hansen wrote: Hi, On an 8.2 box, I run freebsd-update -r 8.3-RELEASE upgrade I am getting hundreds of files with conflicts like: current version # $FreeBSD: src/etc/auth.conf,v 1.6.32.1.4.1 2010/06/14 02:09:06 kensmith Exp $ === # $FreeBSD: src/etc/auth.conf,v 1.6.32.1.8.1 2012/03/03 06:15:13 kensmith Exp $ I don't know why this happens. Upgrading a couple of boxes from 8.1-RELEASE to 8.3-RELEASE did not give me these conflicts. As far as I know freebsd-update does not use mergemaster.rc, just freebsd-update.conf It might be the case that you have upgraded from source before on this machine that causes this situation? 8.3-RELEASE ... which is just tremendously unhelpful. I'm using the default freebsd-update configuration. Per an old mail from the archives I made sure I have /etc/mergemaster.rc setup as below, but it doesn't seem to make a difference. Any ideas? In the past I've just given up on using freebsd-update and gone back to manually compiling and installing world, but for this box I'd really like not to. Ask $ cat /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:.*[$]' ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: Mergemaster Fails
On 06/06/12 21:20, Chris Nehren wrote: Have you tried ctrl-t? This will send SIGINFO to the process which No response to any key except ^z Additionally, the output of ps ax -d (show process trees) would be helpful. This should also show what mergemaster is waiting on. Viewing the output of the script with vi ... ^M @@ -4165,7 +4173,7 @@^M match bus uhub[0-9]+;^M match mode host;^M match vendor 0x9710;^M - match product 0x7830;^M + match product (0x7830|0x7832);^M action kldload -n if_mos;^M };^M ^M @@ -4336,5 +4344,5 @@^M action kldload -n umass;^M };^M ^M -# 1652 USB entries processed^M +# 1654 USB entries processed^M ^M ^[[7m(END)^[[27m^[[K^G^M^[[K^[[7m(END)^[[27m^[[K^G^M^[[K^[[7m(END)^[[27m^[[K^G^M^[[K^[[7m(END)^[[27m^[[K^G^M^[[K^[[7m(END)^[[27m^[[K^G^M^[[K^[[7m(END)^[[27m^[[K^G^M^[[K^[[7m(END)^[[27m^[[K^G^M^[[K^[[7m(END)^[[27m^[[K^G^M^[[K^[[7m(END)^[[27m^[[K^G^M^[[K^[[7m(END)^[[27m^[[K^G^M^[[K^[[7m(END)^[[27m^[[K^M^[[K^G^M^[[K^[[7m(END)^[[27m^[[K^M^[[K^G^M^[[K^[[7m(END)^[[27m^[[K^M^[[K^G^M^[[K^[[7m(END)^[[27m^[[K^M^[[K^G^M^[[K^[[7m(END)^[[27m^[[K^M^[[K^G^M^[[K^[[7m(END)^[[27m^[[K^M^[[K^G^M^[[K^[[7m(END)^[[27m^[[K^M^[[K^G^M^[[K^[[7m(END)^[[27m^[[K^G^M^[[K^[[7m(END)^[[27m^[[K^M^[[K^G^M^[[K^[[7m(END)^[[27m^[[K^G^M^[[K^[[7m(END)^[[27m^[[K^G^M^[[K^[[7m(END)^[[27m^[[K^G^M^[[K^[[7m(END)^[[27m^[[K^M^[[K^[[?1l^[^M Suspended^M ... There are a large number of control characters, then (END) then, no response to any key except ^z. from ps -ax -d: PID PPID STAT TIME COMMAND 00 DLs 0:00.02 [kernel] 10 ILs 0:00.02 - /sbin/init -- 1031 Is0:00.00 |-- adjkerntz -i 7531 Ss0:00.02 |-- /usr/sbin/moused -p /dev/ums0 -t auto -I /var/run/m 7731 Is0:00.00 |-- /sbin/devd 8931 Is0:00.00 |-- dhclient: em0 [priv] (dhclient) 9311 Is0:00.00 |-- dhclient: em0 (dhclient) 9721 Ss0:00.00 |-- /usr/sbin/syslogd -s 9861 Ss0:00.00 |-- /usr/sbin/rpcbind 10191 Is0:00.00 |-- /usr/sbin/mountd -r 10251 Is0:00.01 |-- nfsd: master (nfsd) 1026 1025 S 0:00.00 | `-- nfsd: server (nfsd) 10401 Is0:00.01 |-- /usr/local/sbin/cupsd -C /usr/local/etc/cups/cupsd. 10561 Ss0:00.00 |-- /usr/local/sbin/nmbd -D -s /usr/local/etc/smb.conf 10591 Ss0:00.01 |-- /usr/local/sbin/smbd -D -s /usr/local/etc/smb.conf 1107 1059 I 0:00.00 | `-- /usr/local/sbin/smbd -D -s /usr/local/etc/smb.con 10901 Ss0:00.00 |-- /usr/sbin/ntpd -c /etc/ntp.conf -p /var/run/ntpd.pi 11121 Ss0:00.05 |-- /usr/local/bin/postgres -D /usr/local/pgsql/data 1114 1112 Ss0:00.00 | |-- postgres: writer process(postgres) 1115 1112 Ss0:00.00 | |-- postgres: wal writer process(postgres) 1116 1112 Ss0:00.00 | |-- postgres: autovacuum launcher process (postgre 1117 1112 Ss0:00.00 | `-- postgres: stats collector process (postgres) 11261 Is0:00.00 |-- /usr/local/bin/dbus-daemon --system 11391 Ss0:00.00 |-- sendmail: accepting connections (sendmail) 11471 Is0:00.00 |-- sendmail: Queue runner@00:30:00 for /var/spool/clie 11771 Is0:00.00 |-- /usr/sbin/sshd 11811 Is0:00.00 |-- /usr/sbin/cron -s 12051 Is0:00.00 |-- /usr/sbin/inetd -wW -C 60 12371 Is0:00.13 |-- /usr/local/sbin/hald 1240 1237 I 0:00.01 | `-- hald-runner 1262 1240 I 0:00.00 | |-- hald-addon-mouse-sysmouse: /dev/ums0 (hald-addo 1304 1240 S 0:00.01 | `-- hald-addon-storage: /dev/cd0 (hald-addon-storag 12251 Is0:00.00 |-- login [pam] (login) 1308 1225 I+0:00.01 | `-- -tcsh (tcsh) 1320 1308 I 0:00.00 | `-- /bin/sh /usr/local/bin/startx 1338 1320 I 0:00.00 | `-- xinit /home/tomdean/.xinitrc -- /usr/local/bi 1339 1338 R 0:06.58 | |-- /usr/local/bin/X :0 -auth /home/tomdean/.se 1341 1338 I 0:00.01 | `-- /usr/local/bin/xterm -j -sk -sb -sl 1000 -f 1342 1341 I 0:00.01 | |-- twm 1343 1341 S 0:00.07 | |-- xclock -digital -update 1 -geometry 230x3 1344 1341 I 0:00.01 | |-- /usr/local/bin/xterm -j -sk -sb -sl 1000 1354 1344 Is+ 0:00.02 | | `-- tcsh 1363 1354 I 0:00.01 | | `-- /usr/local/bin/xterm -bd red -cr red 1365 1363 Is0:00.01 | | `-- su 1366 1365 I 0:00.01 | | `-- _su (csh) 1368 1366 I+0:00.00 | | `-- script /tmp/mergemaster 1369 1368 Is0:00.01 | | `-- /bin/csh -i 1371 1369 I+0:00.05 | | `-- /bin/sh /usr/sbin/mergemast 2423 1371 I+0:00.00 | | `-- less 1345 1341 S 0:00.02 | |-- /usr/local/bin/xterm -j -sk -sb -sl 1000 1352 1345 Ss0:00.02 | | `-- tcsh 2429 1352 R+0:00.00 | | `-- /bin/ps -o pid,ppid,stat,time,command 1346 1341 I 0:00.01 | |-- /usr/local/bin/xterm -j -sk -sb -sl 1000 1353 1346 Is+ 0:00.01 | | `-- tcsh 1351 1341
Re: Mergemaster Fails
On Thu, Jun 07, 2012 at 10:05:24 -0700 , Thomas D. Dean wrote: On 06/06/12 21:20, Chris Nehren wrote: Have you tried ctrl-t? This will send SIGINFO to the process which No response to any key except ^z Additionally, the output of ps ax -d (show process trees) would be helpful. This should also show what mergemaster is waiting on. Viewing the output of the script with vi ... ^M @@ -4165,7 +4173,7 @@^M match bus uhub[0-9]+;^M match mode host;^M match vendor 0x9710;^M - match product 0x7830;^M + match product (0x7830|0x7832);^M action kldload -n if_mos;^M [snipped] There are a large number of control characters, then (END) then, no response to any key except ^z. It looks like there's a pager (probably less) that's waiting for you to respond. The output suggests it's showing you the results of diffing an old file with a new one--could be either /etc/devd.conf or /etc/usb.conf. from ps -ax -d: PID PPID STAT TIME COMMAND [snipped] 1339 1338 R 0:06.58 | |-- /usr/local/bin/X :0 -auth /home/tomdean/.se 1341 1338 I 0:00.01 | `-- /usr/local/bin/xterm -j -sk -sb -sl 1000 -f 1342 1341 I 0:00.01 | |-- twm 1343 1341 S 0:00.07 | |-- xclock -digital -update 1 -geometry 230x3 1344 1341 I 0:00.01 | |-- /usr/local/bin/xterm -j -sk -sb -sl 1000 1354 1344 Is+ 0:00.02 | | `-- tcsh 1363 1354 I 0:00.01 | | `-- /usr/local/bin/xterm -bd red -cr red 1365 1363 Is0:00.01 | | `-- su 1366 1365 I 0:00.01 | | `-- _su (csh) 1368 1366 I+0:00.00 | | `-- script /tmp/mergemaster 1369 1368 Is0:00.01 | | `-- /bin/csh -i 1371 1369 I+0:00.05 | | `-- /bin/sh /usr/sbin/mergemast 2423 1371 I+0:00.00 | | `-- less And this confirms it. So you'll probably want to examine the changes in the script(1) output and then quit the pager. I would also recommend running mergemaster in single user mode to avoid this sort of thing. X11 complicates things an awful lot. -- Thanks and best regards, Chris Nehren pgpUFFcj0563R.pgp Description: PGP signature
Re: Mergemaster Fails
On 06/07/12 10:55, Chris Nehren wrote: On Thu, Jun 07, 2012 at 10:05:24 -0700 , Thomas D. Dean wrote: It looks like there's a pager (probably less) that's waiting for you to respond. The output suggests it's showing you the results of diffing an old file with a new one--could be either /etc/devd.conf or /etc/usb.conf. This is obvious, but, what is causing the hang. I get it from the console as well as in an xterm. Tom Dean ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: Mergemaster Fails
On Thu, Jun 07, 2012 at 10:05:24AM -0700, Thomas D. Dean wrote:
On 06/06/12 21:20, Chris Nehren wrote:
Have you tried ctrl-t? This will send SIGINFO to the process which
No response to any key except ^z
Doesn't ^t work at all for you?
If you're using tcsh and some *rxvt terminal emulator add this to your
.[t]cshrc:
# Quirk for urxvt
if(${?COLORTERM}) then
if(${COLORTERM} == rxvt-xpm ${OSTYPE} == FreeBSD) then
/bin/stty status ^t
endif
endif
pgpfOOQGeU4aJ.pgp
Description: PGP signature
Mergemaster Fails
Mergemaster fails in a up-to-date as of now build.
uname -a
FreeBSD P9X79.tddhome 9.0-STABLE FreeBSD 9.0-STABLE #0: Wed Jun 6
16:16:58 PDT 2012 root@P9X79.tddhome:/usr/obj/usr/src/sys/GENERIC
amd64
# mergemaster
...
[END]
And no response to the keyboard, except ctrl-Z.
^Z
# ps
...
1363 4 Is 0:00.01 su
1364 4 S0:00.01 _su (csh)
1368 4 T0:00.06 /bin/sh /usr/sbin/mergemaster
2434 4 T0:00.01 less
2439 4 R+ 0:00.00 ps
How do I get around this?
Tom Dean
From script /tmp/mergemaster
# mergemaster
Script started on Wed Jun 6 16:48:05 2012
You have mail.
root@P9X79:/usr/src # mergemaster^M
*** 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] 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
+ ln -s ../var/named/etc/namedb /var/tmp/temproot/etc/namedb
+ ln -s mail/aliases /var/tmp/temproot/etc/aliases
*** Beginning comparison
*** Checking /etc/rc.d for stale files
*** No stale files found
*** Temp ./.cshrc and installed have the same CVS Id, deleting
*** Temp ./.profile and installed have the same CVS Id, deleting
*** Temp ./COPYRIGHT and installed have the same CVS Id, deleting
*** Temp ./boot/device.hints and installed have the same CVS Id, deleting
*** Temp ./etc/amd.map and installed have the same CVS Id, deleting
*** Temp ./etc/apmd.conf and installed have the same CVS Id, deleting
*** Temp ./etc/auth.conf and installed have the same CVS Id, deleting
*** Temp ./etc/bluetooth/hcsecd.conf and installed have the same CVS
Id, deleting
*** Temp ./etc/bluetooth/hosts and installed have the same CVS Id,
deleting
*** Temp ./etc/bluetooth/protocols and installed have the same CVS Id,
deleting
*** Temp ./etc/crontab and installed have the same CVS Id, deleting
*** Temp ./etc/csh.cshrc and installed have the same CVS Id, deleting
*** Temp ./etc/csh.login and installed have the same CVS Id, deleting
*** Temp ./etc/csh.logout and installed have the same CVS Id, deleting
*** Temp ./etc/ddb.conf and installed have the same CVS Id, deleting
*** Temp ./etc/defaults/bluetooth.device.conf and installed have the
same CVS Id, deleting
*** Temp ./etc/defaults/devfs.rules and installed have the same CVS
Id, deleting
*** Temp ./etc/defaults/periodic.conf and installed have the same CVS
Id, deleting
*** Temp ./etc/defaults/rc.conf and installed have the same CVS Id,
deleting
*** Temp ./etc/devd.conf and installed have the same CVS Id, deleting
*** Temp ./etc/devd/asus.conf and installed have the same CVS Id, deleting
*** Temp ./etc/devd/uath.conf and installed have the same CVS Id, deleting
==
ESC[?1hESC=^M *** Displaying differences between ./etc/devd/usb.conf
and installed version:
--- /etc/devd/usb.conf 2012-03-27 21:31:26.0 -0700
+++ ./etc/devd/usb.conf 2012-06-06 16:48:12.0 -0700
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/etc/devd/usb.conf,v 1.2.4.4 2012/03/27 15:33:38
hselasky Exp $
+# $FreeBSD: src/etc/devd/usb.conf,v 1.2.4.5 2012/06/01 07:06:00
hselasky Exp $
#
# This file was automatically generated by tools/bus_autoconf.sh.
# Please do not edit!
@@ -157,7 +157,7 @@
match bus uhub[0-9]+;
match mode host;
match vendor 0x0403;
- match product
(0x6001|0x6004|0x6010|0x6011|0x8372|0x9e90|0xa6d0|0xa6d0|0xcc48|0xcc49|0xcc4a|0xd678|0xe6c8|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xee18|0xf608|0xf60b|0xf850|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfc08|0xfc09|0xfc0b|0xfc0c|0xfc0d|0xfc82);
+ match product
(0x6001|0x6004|0x6010|0x6011|0x8372|0x9e90|0xcc48|0xcc49|0xcc4a|0xd678|0xe6c8|0xe888|0xe889|0xe88a|0xe88b|0xe88c|0xee18|0xf608|0xf60b|0xf850|0xfa00|0xfa01|0xfa02|0xfa03|0xfa04|0xfc08|0xfc09|0xfc0b|0xfc0c|0xfc0d|0xfc82);
action kldload -n uftdi;
};
@@ -1021,7 +1021,7 @@
match bus uhub[0-9]+;
match mode host;
match vendor 0x05c6;
- match product (0x1000|0x6000|0x6613);
+ match product (0x1000|0x6000|0x6613|0x9000);
action kldload -n u3g;
};
@@ -2852,6 +2852,14 @@
nomatch 32 {
match bus uhub[0-9]+;
match mode host;
+ match vendor 0x1199;
+ match product 0x68aa;
+ action kldload -n u3g;
+};
+
+nomatch 32 {
+ match bus uhub[0-9]+;
+ match mode host;
match vendor 0x11ad;
match product 0x0701;
action kldload -n uplcom;
@@ -3661,7 +3669,7 @@
match bus uhub[0-9
Re: Mergemaster Fails
On Wed, Jun 06, 2012 at 16:51:27 -0700 , Thomas D. Dean wrote: Mergemaster fails in a up-to-date as of now build. uname -a FreeBSD P9X79.tddhome 9.0-STABLE FreeBSD 9.0-STABLE #0: Wed Jun 6 16:16:58 PDT 2012 root@P9X79.tddhome:/usr/obj/usr/src/sys/GENERIC amd64 # mergemaster ... [END] And no response to the keyboard, except ctrl-Z. ^Z # ps ... 1363 4 Is 0:00.01 su 1364 4 S0:00.01 _su (csh) 1368 4 T0:00.06 /bin/sh /usr/sbin/mergemaster 2434 4 T0:00.01 less 2439 4 R+ 0:00.00 ps How do I get around this? Have you tried ctrl-t? This will send SIGINFO to the process which causes the shell to print out some information about the running program (and if the foreground program knows about the signal, it can print out some useful diagnostic info as well, like fsck and dd do). It sounds like something is waiting for input or otherwise wedged, and ^T might tell us which command and what it's trying to do. Additionally, the output of ps ax -d (show process trees) would be helpful. This should also show what mergemaster is waiting on. -- Thanks and best regards, Chris Nehren pgpxR6TEwn8qi.pgp Description: PGP signature
Re: 7-STABLE: mergemaster tzsetup question
On 12/03/2011 07:24, Christian Weisgerber wrote: Every time I run mergemaster(8) on 7.4-STABLE, I'm now presented with *** There is no /var/db/zoneinfo file to update /etc/localtime. You should run tzsetup Running tzsetup(8) does however not create /var/db/zoneinfo, so mergemaster will prompt the next time, too. I guess I can just ignore it, but it seems weird that mergemaster would keep nagging about this. Where is /var/db/zoneinfo supposed to come from? I also notice that mergemaster can issue tzsetup arguments -C and -r, but tzsetup doesn't support those. Once again, my apologies for assuming that my esteemed colleagues had done the responsible thing and MFC'ed their own work. I have resolved this issue by going back and doing 3 1/2 years of MFCs for tzsetup(8), which now makes it identical to the code in stable/8. If you update your src tree and then update tzsetup you should no longer experience this problem. Doug -- [^L] Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: 7-STABLE: mergemaster tzsetup question
On 12/04/2011 12:51, Doug Barton wrote: On 12/3/2011 6:00 PM, Edwin Groothuis wrote: On 04/12/2011, at 11:12 , Doug Barton wrote: On 12/3/2011 8:14 AM, Max Khon wrote: Christian, On Sat, Dec 3, 2011 at 10:24 PM, Christian Weisgerber na...@mips.inka.de wrote: Every time I run mergemaster(8) on 7.4-STABLE, I'm now presented with *** There is no /var/db/zoneinfo file to update /etc/localtime. You should run tzsetup Running tzsetup(8) does however not create /var/db/zoneinfo, so mergemaster will prompt the next time, too. I guess I can just ignore it, but it seems weird that mergemaster would keep nagging about this. Where is /var/db/zoneinfo supposed to come from? I also notice that mergemaster can issue tzsetup arguments -C and -r, but tzsetup doesn't support those. tzsetup in FreeBSD 8 and later creates /var/db/zoneinfo. It seems that mergemaster was merged to RELENG_7 but appropiate version of tzsetup was not. Well that's embarrassing. :) Edwin, what are the chances that you could MFC your changes to tzsetup? If you still have a machine running 7.x (which I don't have anymore), then go for it and do your damage :-) Well I was kind of hoping you'd be responsible for doing your own work. :) (You see, I'm kind of tired of doing other people's MFCs.) You can use ref7.freebsd.org if you need a test platform. Edwin, I haven't seen a response from you on this, apologies if you sent one and I missed it. Can you let me know your plans? Doug -- [^L] Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: 7-STABLE: mergemaster tzsetup question
On 12/3/2011 6:00 PM, Edwin Groothuis wrote: On 04/12/2011, at 11:12 , Doug Barton wrote: On 12/3/2011 8:14 AM, Max Khon wrote: Christian, On Sat, Dec 3, 2011 at 10:24 PM, Christian Weisgerber na...@mips.inka.de wrote: Every time I run mergemaster(8) on 7.4-STABLE, I'm now presented with *** There is no /var/db/zoneinfo file to update /etc/localtime. You should run tzsetup Running tzsetup(8) does however not create /var/db/zoneinfo, so mergemaster will prompt the next time, too. I guess I can just ignore it, but it seems weird that mergemaster would keep nagging about this. Where is /var/db/zoneinfo supposed to come from? I also notice that mergemaster can issue tzsetup arguments -C and -r, but tzsetup doesn't support those. tzsetup in FreeBSD 8 and later creates /var/db/zoneinfo. It seems that mergemaster was merged to RELENG_7 but appropiate version of tzsetup was not. Well that's embarrassing. :) Edwin, what are the chances that you could MFC your changes to tzsetup? If you still have a machine running 7.x (which I don't have anymore), then go for it and do your damage :-) Well I was kind of hoping you'd be responsible for doing your own work. :) (You see, I'm kind of tired of doing other people's MFCs.) You can use ref7.freebsd.org if you need a test platform. -- We could put the whole Internet into a book. Too practical. Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
7-STABLE: mergemaster tzsetup question
Every time I run mergemaster(8) on 7.4-STABLE, I'm now presented with *** There is no /var/db/zoneinfo file to update /etc/localtime. You should run tzsetup Running tzsetup(8) does however not create /var/db/zoneinfo, so mergemaster will prompt the next time, too. I guess I can just ignore it, but it seems weird that mergemaster would keep nagging about this. Where is /var/db/zoneinfo supposed to come from? I also notice that mergemaster can issue tzsetup arguments -C and -r, but tzsetup doesn't support those. -- Christian naddy Weisgerber na...@mips.inka.de ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: 7-STABLE: mergemaster tzsetup question
On Sat, Dec 03, 2011 at 03:24:54PM +, Christian Weisgerber wrote: Every time I run mergemaster(8) on 7.4-STABLE, I'm now presented with *** There is no /var/db/zoneinfo file to update /etc/localtime. You should run tzsetup Running tzsetup(8) does however not create /var/db/zoneinfo, so mergemaster will prompt the next time, too. I guess I can just ignore it, but it seems weird that mergemaster would keep nagging about this. Where is /var/db/zoneinfo supposed to come from? It's a path, relative to /usr/share/zoneinfo, for the source of the file that was copied to /etc/localtime. Thus, in my case, it reads: America/Los_Angeles on my laptop. For machines that run UTC, it's not needed. ... Peace, david -- David H. Wolfskill da...@catwhisker.org Depriving a girl or boy of an opportunity for education is evil. See http://www.catwhisker.org/~david/publickey.gpg for my public key. pgpKASceaTfAj.pgp Description: PGP signature
Re: 7-STABLE: mergemaster tzsetup question
Christian, On Sat, Dec 3, 2011 at 10:24 PM, Christian Weisgerber na...@mips.inka.de wrote: Every time I run mergemaster(8) on 7.4-STABLE, I'm now presented with *** There is no /var/db/zoneinfo file to update /etc/localtime. You should run tzsetup Running tzsetup(8) does however not create /var/db/zoneinfo, so mergemaster will prompt the next time, too. I guess I can just ignore it, but it seems weird that mergemaster would keep nagging about this. Where is /var/db/zoneinfo supposed to come from? I also notice that mergemaster can issue tzsetup arguments -C and -r, but tzsetup doesn't support those. tzsetup in FreeBSD 8 and later creates /var/db/zoneinfo. It seems that mergemaster was merged to RELENG_7 but appropiate version of tzsetup was not. Max ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: 7-STABLE: mergemaster tzsetup question
On 03/12/2011 15:24, Christian Weisgerber wrote: Every time I run mergemaster(8) on 7.4-STABLE, I'm now presented with *** There is no /var/db/zoneinfo file to update /etc/localtime. You should run tzsetup Running tzsetup(8) does however not create /var/db/zoneinfo, so mergemaster will prompt the next time, too. I guess I can just ignore it, but it seems weird that mergemaster would keep nagging about this. Where is /var/db/zoneinfo supposed to come from? I also notice that mergemaster can issue tzsetup arguments -C and -r, but tzsetup doesn't support those. tzsetup(8) does create /var/db/zoneinfo in 8.2-STABLE. It's just a very small text file containing the default timezone name -- eg. I have: % cat zoneinfo Europe/London Just creating that file will quiet mergemaster, although it won't be of any use to tzsetup in 7.4-STABLE. Looks like this MFC only went into stable/8, and not stable/7: http://svnweb.freebsd.org/base?view=revisionrevision=220183 but the related /var/db/zoneinfo code in mergemaster was merged to stable/7 (as well as stable/8): http://svnweb.freebsd.org/base?view=revisionrevision=227150 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: 7-STABLE: mergemaster tzsetup question
On 12/3/2011 8:14 AM, Max Khon wrote: Christian, On Sat, Dec 3, 2011 at 10:24 PM, Christian Weisgerber na...@mips.inka.de wrote: Every time I run mergemaster(8) on 7.4-STABLE, I'm now presented with *** There is no /var/db/zoneinfo file to update /etc/localtime. You should run tzsetup Running tzsetup(8) does however not create /var/db/zoneinfo, so mergemaster will prompt the next time, too. I guess I can just ignore it, but it seems weird that mergemaster would keep nagging about this. Where is /var/db/zoneinfo supposed to come from? I also notice that mergemaster can issue tzsetup arguments -C and -r, but tzsetup doesn't support those. tzsetup in FreeBSD 8 and later creates /var/db/zoneinfo. It seems that mergemaster was merged to RELENG_7 but appropiate version of tzsetup was not. Well that's embarrassing. :) Edwin, what are the chances that you could MFC your changes to tzsetup? Doug -- We could put the whole Internet into a book. Too practical. Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: 7-STABLE: mergemaster tzsetup question
On 12/3/2011 8:16 AM, David Wolfskill wrote: For machines that run UTC, it's not needed. FYI, the code in mergemaster checks for that. -- We could put the whole Internet into a book. Too practical. Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: 7-STABLE: mergemaster tzsetup question
On 04/12/2011, at 11:12 , Doug Barton wrote: On 12/3/2011 8:14 AM, Max Khon wrote: Christian, On Sat, Dec 3, 2011 at 10:24 PM, Christian Weisgerber na...@mips.inka.de wrote: Every time I run mergemaster(8) on 7.4-STABLE, I'm now presented with *** There is no /var/db/zoneinfo file to update /etc/localtime. You should run tzsetup Running tzsetup(8) does however not create /var/db/zoneinfo, so mergemaster will prompt the next time, too. I guess I can just ignore it, but it seems weird that mergemaster would keep nagging about this. Where is /var/db/zoneinfo supposed to come from? I also notice that mergemaster can issue tzsetup arguments -C and -r, but tzsetup doesn't support those. tzsetup in FreeBSD 8 and later creates /var/db/zoneinfo. It seems that mergemaster was merged to RELENG_7 but appropiate version of tzsetup was not. Well that's embarrassing. :) Edwin, what are the chances that you could MFC your changes to tzsetup? If you still have a machine running 7.x (which I don't have anymore), then go for it and do your damage :-) Edwin___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: 7.2-p7 - 8-STABLE mergemaster core dump
Can others with remote systems comment about what they do in this step? installkernel, reboot, installworld, mergemaster, reboot. *But* - for remote systems I never make huge leaps. I would certainly never upgrade across a major version like you are doing. Fpr those upgrades (which are only once per yer maximum) I make the effort to go down there and do it physically in front of the machine. Within a single major release, however, I have never had any problems with the above prcedure. -pete. ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: 7.2-p7 - 8-STABLE mergemaster core dump
On Wed, 17 Mar 2010, Cristiano Deana wrote: yes, i knew. but i was updating via ssh, so forget run in single user. i also know the exact procedure, but i upgrade hundreds of times before today making this procedure and always went fine. So, it works just fine right up until the time it doesn't work. Feel free to deviate from the documented procedures, it's your system. Just don't be surprised if things break. Doug ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: 7.2-p7 - 8-STABLE mergemaster core dump
At 01:55 a.m. 18/03/2010, Doug Barton wrote: On Wed, 17 Mar 2010, Cristiano Deana wrote: yes, i knew. but i was updating via ssh, so forget run in single user. i also know the exact procedure, but i upgrade hundreds of times before today making this procedure and always went fine. So, it works just fine right up until the time it doesn't work. Feel free to deviate from the documented procedures, it's your system. Just don't be surprised if things break. Doug ___ Hello all. With all respect Doug, users that have remote machines and do not have access to it to boot single user like the manual says.. what can we do? I understand that step is to be sure that no user will modify something while we are doing those process. In my case I do that step after midnight when our users are not in the server. Can others with remote systems comment about what they do in this step? Thanks in advance Jorge Biquez ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: 7.2-p7 - 8-STABLE mergemaster core dump
On Thu, Mar 18, 2010 at 12:27 PM, Jorge Biquez jbiq...@icsmx.com wrote: Hello all. With all respect Doug, users that have remote machines and do not have access to it to boot single user like the manual says.. what can we do? I understand that step is to be sure that no user will modify something while we are doing those process. In my case I do that step after midnight when our users are not in the server. Can others with remote systems comment about what they do in this step? Thanks in advance KVM over IP or have someone onsite who is at least able to follow instructions and trusted eg datacenter personel(Some offer a helping hands type of program). KVM over IP is much preferred. Your KVM should be plugged into a power strip capable of remote management in case it flakes out(the ones I've used all do occasionally) so can be power cycled. -- Adam Vande More ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: 7.2-p7 - 8-STABLE mergemaster core dump
On Thu, Mar 18, 2010 at 11:27:48AM -0600, Jorge Biquez wrote: At 01:55 a.m. 18/03/2010, Doug Barton wrote: On Wed, 17 Mar 2010, Cristiano Deana wrote: yes, i knew. but i was updating via ssh, so forget run in single user. i also know the exact procedure, but i upgrade hundreds of times before today making this procedure and always went fine. So, it works just fine right up until the time it doesn't work. Feel free to deviate from the documented procedures, it's your system. Just don't be surprised if things break. Doug ___ Hello all. With all respect Doug, users that have remote machines and do not have access to it to boot single user like the manual says.. what can we do? I understand that step is to be sure that no user will modify something while we are doing those process. In my case I do that step after midnight when our users are not in the server. Can others with remote systems comment about what they do in this step? Serial console. -- | Jeremy Chadwick j...@parodius.com | | Parodius Networking http://www.parodius.com/ | | UNIX Systems Administrator Mountain View, CA, USA | | Making life hard for others since 1977. PGP: 4BD6C0CB | ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: 7.2-p7 - 8-STABLE mergemaster core dump
On Thu, Mar 18, 2010 at 5:27 PM, Jorge Biquez jbiq...@icsmx.com wrote: Hello all. With all respect Doug, users that have remote machines and do not have access to it to boot single user like the manual says.. what can we do? I understand that step is to be sure that no user will modify something while we are doing those process. In my case I do that step after midnight when our users are not in the server. Can others with remote systems comment about what they do in this step? Thanks in advance Jorge Biquez Hi Jorge As I mentioned in my email, the critical thing is that you must be running your new kernel before installing your new world. The single-user phase is simply to ensure that nothing is running that would interfere with the installworld/mergemaster steps. Therefore, an appropriate workaround if you cannot go to single user mode remotely would be to install the kernel, reboot into the new kernel, install world, reboot into the new world. However, if you have no remote access at all (remote power would be better than nothing!) this would be quite risky. Judicious use of nextboot, and having someone on standby who can find the power button is recommended. Cheers Tom ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: 7.2-p7 - 8-STABLE mergemaster core dump
Hello Toma, Adam, Jeremy and all. Thanks a lot for the comments. Very very helpful. I haven't tried the KVM over IP but willl look at it. In my case one the servers is on a remote site , in other country and for the prices when they have to put hands in you server for sure will be cheaper to buy the kvm and sent it to them. They charge for event and besides for time. With FreeBsd 4.3 never had a problem doing things that way but now is something very important to consider. Thanks a lot. JB At 11:55 a.m. 18/03/2010, Tom Evans wrote: On Thu, Mar 18, 2010 at 5:27 PM, Jorge Biquez jbiq...@icsmx.com wrote: Hello all. With all respect Doug, users that have remote machines and do not have access to it to boot single user like the manual says.. what can we do? I understand that step is to be sure that no user will modify something while we are doing those process. In my case I do that step after midnight when our users are not in the server. Can others with remote systems comment about what they do in this step? Thanks in advance Jorge Biquez Hi Jorge As I mentioned in my email, the critical thing is that you must be running your new kernel before installing your new world. The single-user phase is simply to ensure that nothing is running that would interfere with the installworld/mergemaster steps. Therefore, an appropriate workaround if you cannot go to single user mode remotely would be to install the kernel, reboot into the new kernel, install world, reboot into the new world. However, if you have no remote access at all (remote power would be better than nothing!) this would be quite risky. Judicious use of nextboot, and having someone on standby who can find the power button is recommended. Cheers Tom ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
7.2-p7 - 8-STABLE mergemaster core dump
Hi, anyone else tried to update (todas's cvsup) 7.3-p7 to 8-STABLE? make update make buildworld make kernel make installworld mergemaster and i got a bad system call (core dumped). reboot, mergemaster again and it was allright. i use freebsd from 3.3 (maybe) and this is the first time i had to reboot with new kernel/world to make a mergemaster (very dangerous, i was remote). anyone else? -- Cris, member of G.U.F.I Italian FreeBSD User Group http://www.gufi.org/ ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: 7.2-p7 - 8-STABLE mergemaster core dump
On Wed, Mar 17, 2010 at 03:25:14PM +0100, Cristiano Deana wrote: Hi, anyone else tried to update (todas's cvsup) 7.3-p7 to 8-STABLE? make update make buildworld make kernel make installworld I'm not familiar with upgrading a working 7.x to 8.x box, so I can't tell you for certain if that's what caused your problem. But the above make commands *are not* the proper procedure to follow. /usr/src/Makefile contains the procedure: # 1. `cd /usr/src' (or to the directory containing your source tree). # 2. `make buildworld' # 3. `make buildkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). # 4. `make installkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). # [steps 3. 4. can be combined by using the kernel target] # 5. `reboot'(in single user mode: boot -s from the loader prompt). # 6. `mergemaster -p' # 7. `make installworld' # 8. `make delete-old' # 9. `mergemaster' (you may wish to use -U or -ai). # 10. `reboot' # 11. `make delete-old-libs' (in case no 3rd party program uses them anymore) Chances are the failure you were seeing is/was induced by you doing things in the wrong order. If your system doesn't have remote serial console (for the single user steps), then you get to do it from the VGA console. -- | Jeremy Chadwick j...@parodius.com | | Parodius Networking http://www.parodius.com/ | | UNIX Systems Administrator Mountain View, CA, USA | | Making life hard for others since 1977. PGP: 4BD6C0CB | ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: 7.2-p7 - 8-STABLE mergemaster core dump
On Wed, Mar 17, 2010 at 2:25 PM, Cristiano Deana cristiano.de...@gmail.com wrote: Hi, anyone else tried to update (todas's cvsup) 7.3-p7 to 8-STABLE? make update make buildworld make kernel make installworld mergemaster and i got a bad system call (core dumped). reboot, mergemaster again and it was allright. i use freebsd from 3.3 (maybe) and this is the first time i had to reboot with new kernel/world to make a mergemaster (very dangerous, i was remote). anyone else? You can't always run new userland on an old kernel, but you can always run old userland on a new kernel, which is why the process you went through is not the canonical way. See the handbook or /usr/src/UPDATING: To rebuild everything and install it on the current system. --- # Note: sometimes if you are running current you gotta do more than # is listed here if you are upgrading from a really old current. make sure you have good level 0 dumps make buildworld make kernel KERNCONF=YOUR_KERNEL_HERE [1] reboot in single user [3] mergemaster -p [5] make installworld make delete-old mergemaster [4] reboot Cheers Tom ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: 7.2-p7 - 8-STABLE mergemaster core dump
On Wed, Mar 17, 2010 at 3:32 PM, Tom Evans tevans...@googlemail.com wrote: make update make buildworld make kernel make installworld mergemaster and i got a bad system call (core dumped). You can't always run new userland on an old kernel, but you can always run old userland on a new kernel, which is why the process you went through is not the canonical way. See the handbook or /usr/src/UPDATING: yes, i knew. but i was updating via ssh, so forget run in single user. i also know the exact procedure, but i upgrade hundreds of times before today making this procedure and always went fine. i was just wondering if was a one at a time upgrade failure OR if THIS upgrade (7.2 - 8) have this problem. thanks all. btw, reboot without mergmaster and system was on again. mergemaster, reboot and it's ready. lucky me and thanks to freebsd -- Cris, member of G.U.F.I Italian FreeBSD User Group http://www.gufi.org/ ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: 7.2-p7 - 8-STABLE mergemaster core dump
On Wed, Mar 17, 2010 at 2:37 PM, Cristiano Deana cristiano.de...@gmail.com wrote: On Wed, Mar 17, 2010 at 3:32 PM, Tom Evans tevans...@googlemail.com wrote: make update make buildworld make kernel make installworld mergemaster and i got a bad system call (core dumped). You can't always run new userland on an old kernel, but you can always run old userland on a new kernel, which is why the process you went through is not the canonical way. See the handbook or /usr/src/UPDATING: yes, i knew. but i was updating via ssh, so forget run in single user. i also know the exact procedure, but i upgrade hundreds of times before today making this procedure and always went fine. i was just wondering if was a one at a time upgrade failure OR if THIS upgrade (7.2 - 8) have this problem. thanks all. btw, reboot without mergmaster and system was on again. mergemaster, reboot and it's ready. lucky me and thanks to freebsd It will happen whenever you upgrade incorrectly and the newly installed userland requires syscalls that aren't present in your kernel. You need to be running your new kernel when you install your new world. What can go wrong if you don't do this order? Well, as you can see, you couldn't run mergemaster (and probably many other programs) until running your new kernel. If your new kernel did not boot successfully, you would be left with a kernel.old that boots but cant run the userland and a kernel that does not boot that can run the userland - in other words, you would be screwed. When switching major versions, there is always the chance that something major changes, so I'd try to avoid risky behaviour. YMMV. Cheers Tom ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Problem with Mergemaster and FreeBSD Service Jails
Hi all! I have several freebsd service jail like: http://www.freebsd.org/doc/en/books/handbook/jails-application.html I just upgrade world from RELENG_7_1 to RELENG_8. Now, i need to run mergemaster in each jail to updgrade configuration files. My first attempts of mergemaster i get: ... *** Beginning comparison *** Checking /etc/rc.d for stale files *** No stale files found *** The installed file /etc has the type symbolic link but the new version has the type directory How would you like to handle this? Use 'r' to remove /etc You will be able to install it as a directory Use 'i' to ignore this How to proceed? [i] i *** See the man page about adding /etc to the list of IGNORE_FILES *** Press the [Enter] or [Return] key to continue And similar with other simlinks neccessary to run freebsd service jails: # ln -s s/etc etc # ln -s s/root root # ln -s s/home home # ln -s ../s/usr-local usr/local # ln -s ../s/usr-X11R6 usr/X11R6 # ln -s s/tmp tmp # ln -s s/var var I think mergemaster is not updating my configuration files, at end of proccess i get (i ignore often): *** There is no installed version of ./.cshrc Use 'd' to delete the temporary ./.cshrc Use 'i' to install the temporary ./.cshrc Default is to leave the temporary file to deal with by hand How should I deal with this? [Leave it for later] i install: //.cshrc: Read-only file system *** FATAL ERROR: Unable to install ./.cshrc to / I never have this problem before, i have my jails running for years... Anybody can help me??? Thank you Rubén Lara _ ¿Aún sin la última versión de Internet Explorer 8? ¡Actualízate gratis! http://www.vivelive.com/internetexplorer8___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
HEADS UP: Mass mergemaster MFC to [78]-stable
-BEGIN PGP SIGNED MESSAGE- Hash: RIPEMD160 Howdy, I've merged the following changes to bring mergemaster up to date with what's in HEAD to RELENG_[78]. Of particular interest for most people, especially those with long-lived installs will be r200425, and r200708; however a few of the other changes might also bring surprises. As usual I have tried to be very cautious with the defaults so as not to disrupt people's existing installations, but please heed the usual advice to back up /etc before running mergemaster. I also suggest the regular use of the -P option. If you have any questions or problems please speak up sooner rather than later, since I'd like to get any issues ironed out as far in advance of the 7.3-RELEASE as possible. FYI, I do not plan to merge these changes, or any other changes besides serious bug fixes to RELENG_6. Enjoy, Doug - Original Message Subject: svn commit: r202337 - stable/8/usr.sbin/mergemaster Date: Fri, 15 Jan 2010 03:28:47 + (UTC) Author: dougb Date: Fri Jan 15 03:28:46 2010 New Revision: 202337 URL: http://svn.freebsd.org/changeset/base/202337 Log: MFC r200416: Simplify handling of MTREEFILE relative to DESTDIR Make the message about a missing MTREEFILE combined with -U more informative MFC r200425: Over time things that used to be files/directories/links can change to something else. So add code to detect when things don't match and give the user choices about how to fix it. If we're using -P and something in the above check needs to be moved we need to have the directory there for it, so create it at the beginning and delete empty versions of it at the end. The case where something used to be a file or link and now is supposed to be a directory (e.g., /etc/security) is especially dangerous, so make failure to install a necessary directory in $DESTDIR a fatal error. MFC r200700: In the places where find is used that the user may see the results, first pipe it to sort so that order of processing will be deterministic and like things will be grouped together. MFC r200701: Fix an indentation issue, no functional changes MFC r200708: Fix a problem with how mergemaster handles the hard links for /.cshrc and /.profile. The problem is that install(1) will unlink the old file before it installs the new one, which means that in the best case we have to compare the changes for the old file twice. So, change the logic to first test to see if the link exists, then install the file. Then if the link was there and we're using -i, just create the link in /root and be done with it. Otherwise display the message to the user and give them the option. Because we are now sorting things before doing the comparison we can know conclusively that the files in / should be the sources, and the files in /root will be the targets, so adjust the paths accordingly. While I'm here, split a too-long error message into two lines and just return at the end of handling these files instead of setting the variable that says do nothing and then returning at the end of the function anyway. MFC r201291: Add some patches contributed by jhb: 1. Don't prompt the user for -U but no db error if we're using -a 2. Add an option to delete stale rc.d files automatically if the user has DELETE_STALE_RC_FILES in their rc file. Lack of command line option for this is not an oversight. 3. Add []'s around the terminal $ for the $FreeBSD$ test for -F For one bug raised by jhb I did a more thorough solution: There were a lot of things that snuck in between the end of the test for -r and the start of the comparison. One of them is the creation of the mtree db, as pointed out by jhb. Fix this problem more thoroughly by moving the end of the test down to where it should/used to be, right before the comparison. As a result, indent the interloping code to match. MFC r201292: Document the DELETE_STALE_RC_FILES option introduced in r201291. This is an rc file only option by design. While I'm here, update the comments in the example rc file to indicate which command line options they relate to, and correct the defaults for a couple of options. MFC r201293: It's not necessary to include both Op and Fl for command line options included in the text, so use only the latter. Clarify that using -U doesn't make sense in combination with -a MFC r201323: If we are using -p it does not make any sense to even create the MTREENEW file since it will never be used. MFC r201765: Update copyright date Update delete_temproot() to include the error message if it fails, and clean up the places where it's called. If there are no files left in temproot when the comparison is done delete it without prompting. This should make automated runs of mergemaster without -a a little easier. Document the new behavior in the man page. -BEGIN PGP SIGNATURE
Re: HEADS UP: Mass mergemaster MFC to [78]-stable
On Fri, Jan 15, 2010 at 4:38 AM, Doug Barton do...@freebsd.org wrote: -BEGIN PGP SIGNED MESSAGE- Hash: RIPEMD160 Howdy, Great work, Doug! Thanks. -- chs ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
mergemaster ezjails. different behaviour between 7.1 and 7.2 and up
Hello all . I have an issue using mergemaster and ezjail after the update to FreeBSD 7.2 from 7.1 I have several boxes running ezjails from FreeBSD 7.0 to 7.1 and i always use the same way to update these machines. First a buildworld cycle. then reboot and make sure jails are not running. then ezjail-admin update -i After that i do a mergemaster of the jails. #mergemaster -iU -D /usr/jails/jail1 on a 7.2 and above system i get the following error. cd /usr/src/etc/..; install -o root -g wheel -m 444 COPYRIGHT /var/tmp/temproot/ install -o root -g wheel -m 444 /usr/src/etc/../sys/amd64/conf/GENERIC.hints /var/tmp/temproot/boot/device.hints *** Beginning comparison *** Checking /usr/jails/test//etc/rc.d for stale files *** No stale files found *** There is no installed version of ./boot/device.hints install: mkdir /usr/jails/test//boot: File exists install: /usr/jails/test//boot: No such file or directory *** FATAL ERROR: Unable to install ./boot/device.hints to /usr/jails/test//boot jailhost_co test # And it drops me to the commandline again. On the old 7.0 and 7.1 it works well. It does not drop to commandline but carries on like the example below. cd /usr/src/etc/..; install -o root -g wheel -m 444 COPYRIGHT /var/tmp/temproot/ install -o root -g wheel -m 444 /usr/src/etc/../sys/i386/conf/GENERIC.hints /var/tmp/temproot/boot/device.hints *** Beginning comparison *** Checking /usr/jails/ftp/etc/rc.d for stale files *** No stale files found *** There is no installed version of ./boot/device.hints install: mkdir /usr/jails/ftp/boot: File exists install: /usr/jails/ftp/boot: No such file or directory *** Problem installing ./boot/device.hints, it will remain to merge by hand *** Temp ./etc/bluetooth/hcsecd.conf and installed have the same CVS Id, deleting Here it comes with the *** Problem installing ./boot/device.hints, it will remain to merge by hand line On 7.2 and up (also 8.0BETA1) ir gives me this *** FATAL ERROR: Unable to install ./boot/device.hints to /usr/jails/test//boot Do i need another option i need to give mergemaster? I hope things are clear, i am not that good in explaining things in another language. Regards, Johan ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: mergemaster merge left/right
On Fri, 03.07.2009 at 10:51:08 +0200, Dominic Fandrey wrote: I'd really like mergemaster to tell me whether the left or the right side is the new file. # $FreeBSD: src/etc/devd.conf,v 1.38. | # $FreeBSD: src/etc/devd.conf,v 1.38. Like this I have no idea which one to pick. When using X, maximize your xterm horizontally and use mergemaster -w100 or something like that. It will probe the tty again and offer the real width, so I usually just run mergemaster -w1 and hit enter. hth, Ulrich Spörlein ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: mergemaster merge left/right
Ulrich Spörlein wrote: When using X, maximize your xterm horizontally and use mergemaster -w100 or something like that. It will probe the tty again and offer the real width, so I usually just run mergemaster -w1 and hit enter. Making the window wider is good advice, but the -w option is not needed. If you're running mergemaster in any sort of tty it will automatically set the column width for sdiff for you. hth, Doug ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
mergemaster merge left/right
I'd really like mergemaster to tell me whether the left or the right side is the new file. # $FreeBSD: src/etc/devd.conf,v 1.38. | # $FreeBSD: src/etc/devd.conf,v 1.38. Like this I have no idea which one to pick. ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: mergemaster merge left/right
Speaking of mergemaster, it would be really really nice to have freebsd-update install get the following functionality/options from mergemaster: -i Automatically install any files that do not exist in the destination directory. -F If the files differ only by VCS Id ($FreeBSD) install the new file. This would help avoid having to manually approve installation of hundreds of files in /etc when you upgrade to new releases using freebsd-update. - Sincerely, Dan Naumov On Fri, Jul 3, 2009 at 11:51 AM, Dominic Fandreykamik...@bsdforen.de wrote: I'd really like mergemaster to tell me whether the left or the right side is the new file. # $FreeBSD: src/etc/devd.conf,v 1.38. | # $FreeBSD: src/etc/devd.conf,v 1.38. Like this I have no idea which one to pick. ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: mergemaster merge left/right
On Fri, Jul 3, 2009 at 10:51 AM, Dominic Fandreykamik...@bsdforen.de wrote: I'd really like mergemaster to tell me whether the left or the right side is the new file. # $FreeBSD: src/etc/devd.conf,v 1.38. | # $FreeBSD: src/etc/devd.conf,v 1.38. From - To The new one is *always* the right one. -- Cris, member of G.U.F.I Italian FreeBSD User Group http://www.gufi.org/ ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: mergemaster merge left/right
Cristiano Deana wrote: On Fri, Jul 3, 2009 at 10:51 AM, Dominic Fandreykamik...@bsdforen.de wrote: I'd really like mergemaster to tell me whether the left or the right side is the new file. # $FreeBSD: src/etc/devd.conf,v 1.38. | # $FreeBSD: src/etc/devd.conf,v 1.38. From - To The new one is *always* the right one. I don't have to merge files all that often. mergmaster is pretty easy to use, apart from the lack of that information. It wouldn't be very hard to print old file | new file at the beginning of a merge. ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: mergemaster merge left/right
On Fri, 2009-07-03 at 10:51 +0200, Dominic Fandrey wrote: I'd really like mergemaster to tell me whether the left or the right side is the new file. # $FreeBSD: src/etc/devd.conf,v 1.38. | # $FreeBSD: src/etc/devd.conf,v 1.38. Like this I have no idea which one to pick. The right hand side is always the new file. robert. ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org -- Robert Noland rnol...@freebsd.org FreeBSD signature.asc Description: This is a digitally signed message part
From 7.1 to 7.2 ezjail jails mergemaster not working.
Hello all I have just updated my 7.1 machine to 7.2. I have updated the 7.1 machine several times with a builworld to follow the Security issues, and always use the same approuch. cd /us/src make cleanworld make buildworld make kernel mergemaster -p shutdown now cd /usr/src make installworld mergemaster -iU ezjail-admin update -i mergemaster -iU -D /usr/jails/jail1 mergemaster -iU -D /usr/jails/jail2 this has been working from 7.0 where this machine came from. After my update to 7.2 and after the ezjail-admin update -i i did the mergemaster step and here it goes wrong. this is what i get after the command mergemaster -iU -D /usr/jails/jail1 There is no installed version of ./boot/device.hints install: mkdir /usr.jails/jail1//boot : File exists install: /usr/jails/jail1//boot: no such file or directory *** FATAL ERROR : unable to install ./boot/device.hints to /usr/jails/jail1//boot. what am i doing wrong or what am i forgotten. Thanks for your time. regards, Johan Hendriks ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: mergemaster merge left/right
Robert Noland wrote: On Fri, 2009-07-03 at 10:51 +0200, Dominic Fandrey wrote: I'd really like mergemaster to tell me whether the left or the right side is the new file. # $FreeBSD: src/etc/devd.conf,v 1.38. | # $FreeBSD: src/etc/devd.conf,v 1.38. Like this I have no idea which one to pick. The right hand side is always the new file. I know. Trial and error can tell you that. But I want mergemaster to tell me. ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: mergemaster merge left/right
Dominic Fandrey wrote: Robert Noland wrote: On Fri, 2009-07-03 at 10:51 +0200, Dominic Fandrey wrote: I'd really like mergemaster to tell me whether the left or the right side is the new file. # $FreeBSD: src/etc/devd.conf,v 1.38. | # $FreeBSD: src/etc/devd.conf,v 1.38. Like this I have no idea which one to pick. The right hand side is always the new file. I know. Trial and error can tell you that. But I want mergemaster to tell me. I'm sure Doug would be very happy to receive a patch to review. Mergemaster is a shell script so shouldn't be too difficult to hack something up. Cheers, Lawrence ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
Torfinn Ingolfsen wrote: On Sat, 16 May 2009 16:13:12 -0700 Doug Barton do...@freebsd.org wrote: You should be able to grab the file from HEAD and run it on RELENG_[67] without any problems. I will MFC it as rapidly as possible. FWIW, today I upgraded a machine from 7.1-stable (dated 2009-01-11) to 7.2-stable (csup'ed today). For the mergemaster steps in the make world procedure, I used /usr/src/usr/sbin/mergemaster/mergemaster.sh instead of just mergemaster. Worked like a charm. Thanks! Good news, thanks! Doug -- This .signature sanitized for your protection ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
On Sat, 16 May 2009 16:13:12 -0700 Doug Barton do...@freebsd.org wrote: You should be able to grab the file from HEAD and run it on RELENG_[67] without any problems. I will MFC it as rapidly as possible. FWIW, today I upgraded a machine from 7.1-stable (dated 2009-01-11) to 7.2-stable (csup'ed today). For the mergemaster steps in the make world procedure, I used /usr/src/usr/sbin/mergemaster/mergemaster.sh instead of just mergemaster. Worked like a charm. Thanks! -- Regards, Torfinn Ingolfsen ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
I think I now know what was causing the problem with the files being overwritten, the saved mtree database was somehow reduced to zero bytes causing the list of CHANGED files to be empty. Unfortunately I haven't tracked down the cause of why the mtree file would get emptied out (given that there is already code that should prevent that problem) but I have just committed r192230 which adds a lot of safety belts to the code involving creating and updating the mtree database, and creating and using the list of files with changes. It should no longer be possible to even enter the -U code unless there is both a valid mtree file AND a valid list of files with local changes. FWIW I've also improved the performance of the -U option by changing a use of grep for every file to using case. You should be able to grab the file from HEAD and run it on RELENG_[67] without any problems. I will MFC it as rapidly as possible. Sorry for the inconvenience, Doug -- This .signature sanitized for your protection ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
On Sun, 10 May 2009 21:49:23 -0700 Doug Barton do...@freebsd.org wrote: Torfinn Ingolfsen wrote: To be clear, I follow this procedure: 1. make buildworld 2. make kernel 3. shutdown now 4. mergemaster -p 5. make installworld 6. mergemaster -iU 7. fastboot By any chance is any of this happening in a jail? No - no jails. Or by any chance is /etc a symlink? No, /etc is a regular directory (I just checked the machines). -- Regards, Torfinn Ingolfsen ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: Mergemaster
Doug Hardie wrote: I have been following the discussion on mergemaster and one item is a bit annoying. You can use -U in the command args which sets AUTO_UPGRADE=yes. So far so good. That flag is not in mergemaster.rc. I'm not sure what that is supposed to mean. There is no rc file by default, you have to create it. If what you mean is that it wasn't mentioned in the man page, that has been fixed for a while now. It could be easily added to the rc file, but I suspect it would conflict with -p. It would not conflict with it, in fact if everything is working as it should it should be totally safe. Hence it seems like if unset AUTO_UPGRADE were added to the -p section then it would work. I try hard not to outthink what the user is trying to do, which of course works both ways. It would be helpful to be able to include it in the rc file so I don't have to remember the options each time. [ -z $PRE_WORLD ] AUTO_UPGRADE=yes hth, Doug ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
Torfinn Ingolfsen wrote: To be clear, I follow this procedure: 1. make buildworld 2. make kernel 3. shutdown now 4. mergemaster -p 5. make installworld 6. mergemaster -iU 7. fastboot By any chance is any of this happening in a jail? Or by any chance is /etc a symlink? A user sent me a very interesting patch related to the use of -U in a jail that might be relevant here. Doug ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
Am 05.05.2009, 09:46 Uhr, schrieb Daniel Gerzo dan...@freebsd.org: Manolis Kiagias wrote: I always use -iU too. I've lost motd, passwd, group and master.passwd During mergemaster -p I was asked to merge changes to some of these, and still they were replaced with the newer versions. I don't know what went wrong but have restored them from backup. (I always tar /etc before a source upgrade). Upgrading another system using freebsd-update did not cause any problem. I have the same experience while I was upgrading a few machines upgrading from RELENG_7 to RELENG_7_2. I haven't experienced when upgrading from 7.1-R to 7.2-R. Careful there - RELENG_7 is _newer_ than RELENG_7_2. The latter is branched off RELENG_7 at some point and progresses much slower (as in: errata and security, but no development), so that's no update, but often the reverse. -- Matthias Andree ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
On Thu, 07 May 2009 09:40:52 +0200, Matthias Andree m...@dt.e-technik.tu-dortmund.de wrote: Am 05.05.2009, 09:46 Uhr, schrieb Daniel Gerzo dan...@freebsd.org: Manolis Kiagias wrote: I always use -iU too. I've lost motd, passwd, group and master.passwd During mergemaster -p I was asked to merge changes to some of these, and still they were replaced with the newer versions. I don't know what went wrong but have restored them from backup. (I always tar /etc before a source upgrade). Upgrading another system using freebsd-update did not cause any problem. I have the same experience while I was upgrading a few machines upgrading from RELENG_7 to RELENG_7_2. I haven't experienced when upgrading from 7.1-R to 7.2-R. Careful there - RELENG_7 is _newer_ than RELENG_7_2. The latter is branched off RELENG_7 at some point and progresses much slower (as in: errata and security, but no development), so that's no update, but often the reverse. That's not definitely true all the time. You could for example update your 7.1 to releng_7, say in Sept. 2008, then run this box until releng_7_2 was branched and when you update to it at that point you actually are doing an update, definitely not a downgrade. -- Kind regards Daniel ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
On Tue, 05 May 2009 14:28:22 -0700 Doug Barton do...@freebsd.org wrote: I've read this thread and find the whole thing very odd. In particular I agree - it is odd. I have a few more machines to upgrade in the coming weeks - if anyone have a better testcase to find out what is going on, I'm ready for it. That shouldn't even be possible. You have to affirmatively choose 'i' (for install) for it to be installed at all, the default is to leave it in the temproot directory. Additionally, the code to handle deleting is some of the oldest code in the script, and hasn't changed in over 8 years. Well, something has changed in the way mergemaster handles this, unless there is something else in the make world procedure that updates files in /etc? To be clear, I follow this procedure: 1. make buildworld 2. make kernel 3. shutdown now 4. mergemaster -p 5. make installworld 6. mergemaster -iU 7. fastboot I saw your followup message, can you please do me a favor and modify your /etc/motd file again, then run the following in a script(1) and send me the log? /bin/sh -x mergemaster -iU Done - sent in personal mail. HTH -- Regards, Torfinn Ingolfsen ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Mergemaster
I have been following the discussion on mergemaster and one item is a bit annoying. You can use -U in the command args which sets AUTO_UPGRADE=yes. That flag is not in mergemaster.rc. It could be easily added to the rc file, but I suspect it would conflict with -p. Hence it seems like if unset AUTO_UPGRADE were added to the -p section then it would work. It would be helpful to be able to include it in the rc file so I don't have to remember the options each time. ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
Manolis Kiagias wrote: I always use -iU too. I've lost motd, passwd, group and master.passwd During mergemaster -p I was asked to merge changes to some of these, and still they were replaced with the newer versions. I don't know what went wrong but have restored them from backup. (I always tar /etc before a source upgrade). Upgrading another system using freebsd-update did not cause any problem. I have the same experience while I was upgrading a few machines upgrading from RELENG_7 to RELENG_7_2. I haven't experienced when upgrading from 7.1-R to 7.2-R. Here auth.conf, csh.cshrc, hosts, crontab, syslogd.conf, passswd, master.passwd, group, sysctl.conf motd and maybe some more got overwritten :-( I had to restore from backups. -- S pozdravom / Best regards Daniel Gerzo, FreeBSD committer ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
On Tue, May 05, 2009 at 09:46:22AM +0200, Daniel Gerzo wrote: Manolis Kiagias wrote: I always use -iU too. I've lost motd, passwd, group and master.passwd During mergemaster -p I was asked to merge changes to some of these, and still they were replaced with the newer versions. I don't know what went wrong but have restored them from backup. (I always tar /etc before a source upgrade). Upgrading another system using freebsd-update did not cause any problem. I have the same experience while I was upgrading a few machines upgrading from RELENG_7 to RELENG_7_2. I haven't experienced when upgrading from 7.1-R to 7.2-R. Here auth.conf, csh.cshrc, hosts, crontab, syslogd.conf, passswd, master.passwd, group, sysctl.conf motd and maybe some more got overwritten :-( I had to restore from backups. When upgrading from 7-STABLE to 7.2-RELEASE mergemaster -s -i -U overwrote all the file I'd changed without asking. Luckily I keep all config files that I've changed in a separate repository, so putting it all back was a question of running an install script. But the change is annoying. Roland -- R.F.Smith http://www.xs4all.nl/~rsmith/ [plain text _non-HTML_ PGP/GnuPG encrypted/signed email much appreciated] pgp: 1A2B 477F 9970 BA3C 2914 B7CE 1277 EFB0 C321 A725 (KeyID: C321A725) pgpWWYsyTGg1G.pgp Description: PGP signature
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
On Mon, May 4, 2009 at 10:50 PM, Torfinn Ingolfsen torfinn.ingolf...@broadpark.no wrote: I just upgraded from 7.2-prerelease (as of 20090401) to 7.2-stable as of today, using csup and building world. i upgraded fw machines from _7_1 to _7_2. no problem at all here. did mergemaster is changed from -RELEASE to -STABLE? hint: use always -P option -- Cris, member of G.U.F.I Italian FreeBSD User Group http://www.gufi.org/ ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
Cristiano Deana wrote: On Mon, May 4, 2009 at 10:50 PM, Torfinn Ingolfsen torfinn.ingolf...@broadpark.no wrote: I just upgraded from 7.2-prerelease (as of 20090401) to 7.2-stable as of today, using csup and building world. i upgraded fw machines from _7_1 to _7_2. no problem at all here. did mergemaster is changed from -RELEASE to -STABLE? The last change was before the 7.2-release cycle started (6 weeks ago). hint: use always -P option I agree, it's a good thing to have in your .mergemasterrc (PRESERVE_FILES=yes). Doug -- This .signature sanitized for your protection ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
Torfinn Ingolfsen wrote: Ok, this is strange. I just upgraded from 7.2-prerelease (as of 20090401) to 7.2-stable as of today, using csup and building world. I've read this thread and find the whole thing very odd. In particular regarding your case, the last change to mergemaster was done on March 23rd, so if you updated a system on April 1st then again on May 4th you should have been using the same version of mergemaster. As part of that process I did (as I always do) 'mergemaster -iU' after the 'make installworld' step. /etc/passwd (mergemaster sked about it, I pressed 'd', but it was still upgraded, ugh!) /etc/group (mergemaster sked about it, I pressed 'd', but it was still upgraded, ugh!) That shouldn't even be possible. You have to affirmatively choose 'i' (for install) for it to be installed at all, the default is to leave it in the temproot directory. Additionally, the code to handle deleting is some of the oldest code in the script, and hasn't changed in over 8 years. I saw your followup message, can you please do me a favor and modify your /etc/motd file again, then run the following in a script(1) and send me the log? /bin/sh -x mergemaster -iU Thanks, Doug -- This .signature sanitized for your protection ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
On Tue, 05 May 2009 14:28:22 -0700 Doug Barton do...@freebsd.org wrote: Torfinn Ingolfsen wrote: Ok, this is strange. I just upgraded from 7.2-prerelease (as of 20090401) to 7.2-stable as of today, using csup and building world. I've read this thread and find the whole thing very odd. In particular regarding your case, the last change to mergemaster was done on March 23rd, so if you updated a system on April 1st then again on May 4th you should have been using the same version of mergemaster. There was a recent thread on -questions about this issue too, with the title mergemaster -U overwriting modified files. I've seen mergemaster clobber named.conf but I've failed to repeat it despite changing the revision, file timestamp etc. -- Bruce Cran ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
Ok, this is strange. I just upgraded from 7.2-prerelease (as of 20090401) to 7.2-stable as of today, using csup and building world. As part of that process I did (as I always do) 'mergemaster -iU' after the 'make installworld' step. A few files on my machines are modified by me, and thus should nevber be upgraded: /etc/dhclient.conf /etc/motd (mergemeaster will usually ask about this - this time it did not, it claimed it wasn't user modified, huh?) /etc/profile /root/.profile /etc/passwd (mergemaster sked about it, I pressed 'd', but it was still upgraded, ugh!) /etc/group (mergemaster sked about it, I pressed 'd', but it was still upgraded, ugh!) It can be more files, I haven't found out yet. Has anyone else seen this? I am upgrading my next machine, this time I'll have backups and keep better notes. -- Regards, Torfinn Ingolfsen ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
Torfinn Ingolfsen wrote: Ok, this is strange. I just upgraded from 7.2-prerelease (as of 20090401) to 7.2-stable as of today, using csup and building world. As part of that process I did (as I always do) 'mergemaster -iU' after the 'make installworld' step. A few files on my machines are modified by me, and thus should nevber be upgraded: /etc/dhclient.conf /etc/motd (mergemeaster will usually ask about this - this time it did not, it claimed it wasn't user modified, huh?) /etc/profile /root/.profile /etc/passwd (mergemaster sked about it, I pressed 'd', but it was still upgraded, ugh!) /etc/group (mergemaster sked about it, I pressed 'd', but it was still upgraded, ugh!) It can be more files, I haven't found out yet. Has anyone else seen this? I am upgrading my next machine, this time I'll have backups and keep better notes. I always use -iU too. I've lost motd, passwd, group and master.passwd During mergemaster -p I was asked to merge changes to some of these, and still they were replaced with the newer versions. I don't know what went wrong but have restored them from backup. (I always tar /etc before a source upgrade). Upgrading another system using freebsd-update did not cause any problem. ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
On 4/5/09 21:50, Torfinn Ingolfsen wrote: Ok, this is strange. I just upgraded from 7.2-prerelease (as of 20090401) to 7.2-stable as of today, using csup and building world. As part of that process I did (as I always do) 'mergemaster -iU' after the 'make installworld' step. A few files on my machines are modified by me, and thus should nevber be upgraded: /etc/dhclient.conf /etc/motd (mergemeaster will usually ask about this - this time it did not, it claimed it wasn't user modified, huh?) /etc/profile /root/.profile /etc/passwd (mergemaster sked about it, I pressed 'd', but it was still upgraded, ugh!) /etc/group (mergemaster sked about it, I pressed 'd', but it was still upgraded, ugh!) It can be more files, I haven't found out yet. Has anyone else seen this? I am upgrading my next machine, this time I'll have backups and keep better notes. Not that its a cure but are master.passwd and group backups in /var/backups any help to you in this case? Vince ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE?
On Mon, 04 May 2009 22:26:52 +0100 Vincent Hoffman vi...@unsane.co.uk wrote: Not that its a cure but are master.passwd and group backups in /var/backups any help to you in this case? Ah - great tip - thanks! (In case of the first server, the changes to group and passwd files were few, so I just re-did the changes from memory. The only part I had to look up was user and group mysql. So restoring from /var/backups would have been quicker.) -- Regards, Torfinn Ingolfsen ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: mergemaster annoyance or not?
Oliver Fromme wrote: Doug Barton wrote: The attached patch adds a -F option to automatically install files when only the FreeBSD $Ids differ. I've tested this and it seems to do what the people concerned about this issue are asking for. That seems to be a useful feature. Thanks. You need to quote the dollar signs, though. Well, not only would that defeat the purpose they are there for, it wouldn't work. Perhaps you missed the bit where I said that I actually tested this? :) However, maybe the best solution is to add a new keyword for mergemaster.rc, so the user can exactly specify which kind of changes should be always installed. That's an interesting idea, but I think that the number of times that there is a nonfunctional change other than to the VCS Id are very small, and I don't want to complicate this more than it needs to be. Please remember that we're dealing with two very different groups of users. One is the power user who updates frequently and can certainly hack this sort of thing themselves if they really want it. The other is the average user who only updates once or twice a year, usually to a new release, occasionally to a new patch level, etc. The vast majority of our users are in the latter category, and they need a simple tool with a minimum of foot-shooting capacity. Doug -- This .signature sanitized for your protection ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: mergemaster annoyance or not?
On Wed, 18 Mar 2009, Doug Barton wrote: Oliver Fromme wrote: Doug Barton wrote: The attached patch adds a -F option to automatically install files when only the FreeBSD $Ids differ. I've tested this and it seems to do what the people concerned about this issue are asking for. That seems to be a useful feature. Thanks. You need to quote the dollar signs, though. Well, not only would that defeat the purpose they are there for, it wouldn't work. Perhaps you missed the bit where I said that I actually tested this? :) However, maybe the best solution is to add a new keyword for mergemaster.rc, so the user can exactly specify which kind of changes should be always installed. That's an interesting idea, but I think that the number of times that there is a nonfunctional change other than to the VCS Id are very small, and I don't want to complicate this more than it needs to be. Please remember that we're dealing with two very different groups of users. One is the power user who updates frequently and can certainly hack this sort of thing themselves if they really want it. The other is the average user who only updates once or twice a year, usually to a new release, occasionally to a new patch level, etc. The vast majority of our users are in the latter category, and they need a simple tool with a minimum of foot-shooting capacity. One thing that really bother me is the fact that it patches passwd. I would rather only have mergemaster to use the pw command to add and delete users and groups instead. Its especially annoying when it updated passwd without my content on a remote update. /Bjorn ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: mergemaster annoyance or not?
Doug Barton wrote: The attached patch adds a -F option to automatically install files when only the FreeBSD $Ids differ. I've tested this and it seems to do what the people concerned about this issue are asking for. That seems to be a useful feature. You need to quote the dollar signs, though. However, maybe the best solution is to add a new keyword for mergemaster.rc, so the user can exactly specify which kind of changes should be always installed. So the new -L option (which could still exist as a short-cut) would be the same as the following line in mergemaster.rc: AUTO_INSTALL_DIFF='-I[$]FreeBSD:.*[$]' For example, if someone is not interested in pure white- space changes and changes to #-style comments, he could let those be auto-installed thusly: AUTO_INSTALL_DIFF='-Bb -I#.* -I[$]FreeBSD:.*[$]' What do you think? Best regards Oliver -- Oliver Fromme, secnetix GmbH Co. KG, Marktplatz 29, 85567 Grafing b. M. Handelsregister: Registergericht Muenchen, HRA 74606, Geschäftsfuehrung: secnetix Verwaltungsgesellsch. mbH, Handelsregister: Registergericht Mün- chen, HRB 125758, Geschäftsführer: Maik Bachmann, Olaf Erb, Ralf Gebhart FreeBSD-Dienstleistungen, -Produkte und mehr: http://www.secnetix.de/bsd I have stopped reading Stephen King novels. Now I just read C code instead. -- Richard A. O'Keefe ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: mergemaster annoyance or not?
Daniel O'Connor docon...@gsoft.com.au wrote: I wonder how hard it would be to add 3 way merging (like sysutils/etcmerge) to mergemaster.. One complication: to do a 3-way merge you have to have the common ancestor. To ensure the initial availability of such would require some infrastructure which AFAIK does not currently exist: * A standardized place to keep the original contents of /etc -- /origEtc or /etc-versionId anyone? * A way to ensure that installation populates that place with the needed redundant copy of the bits, either by including the additional instance within the distributions or by generating it in the course of installation. The former would likely be easier, if only because the latter would need to work for all installation methods. ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: mergemaster annoyance or not?
-BEGIN PGP SIGNED MESSAGE-
Hash: RIPEMD160
The attached patch adds a -F option to automatically install files
when only the FreeBSD $Ids differ. I've tested this and it seems to do
what the people concerned about this issue are asking for.
If someone affected by this issue could please test this patch and
report back I'd appreciate it.
Doug
- --
This .signature sanitized for your protection
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.11 (FreeBSD)
iEYEAREDAAYFAkm6G6oACgkQyIakK9Wy8PsUXwCg5hPG8G2swKOC0uhRA5L7Q6xb
a7kAn3DKCxL30ggNzTC9EKBhhjMfgpWq
=8U1J
-END PGP SIGNATURE-
Index: mergemaster.sh
===
--- mergemaster.sh (revision 189761)
+++ mergemaster.sh (working copy)
@@ -263,11 +265,14 @@
# Check the command line options
#
-while getopts :ascrvhipCPm:t:du:w:D:A:U COMMAND_LINE_ARGUMENT ; do
+while getopts :ascrvhipCPm:t:du:w:D:A:FU COMMAND_LINE_ARGUMENT ; do
case ${COMMAND_LINE_ARGUMENT} in
A)
ARCHSTRING='TARGET_ARCH='${OPTARG}
;;
+ F)
+FREEBSD_ID=yes
+;;
U)
AUTO_UPGRADE=yes
;;
@@ -1020,6 +1025,20 @@
# Use more if not.
# Use unified diffs by default. Context diffs give me a headache. :)
#
+
+ # XXX
+ if [ -n $FREEBSD_ID ]; then
+ if diff -q -I$FreeBSD:.*[$] ${DESTDIR}${COMPFILE#.} ${COMPFILE} \
+ /dev/null 21; then
+ if mm_install ${COMPFILE}; then
+echo *** Updated revision control Id for ${DESTDIR}${COMPFILE#.}
+ else
+echo *** Problem installing ${COMPFILE}, it will remain to merge
by hand later
+ fi
+ continue
+ fi
+ fi
+
case ${AUTO_RUN} in
'')
# prompt user to install/delete/merge changes
___
freebsd-stable@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-stable
To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: mergemaster annoyance or not?
On Friday 13 March 2009 17:56:17 per...@pluto.rain.com wrote: Daniel O'Connor docon...@gsoft.com.au wrote: I wonder how hard it would be to add 3 way merging (like sysutils/etcmerge) to mergemaster.. One complication: to do a 3-way merge you have to have the common ancestor. To ensure the initial availability of such would require some infrastructure which AFAIK does not currently exist: * A standardized place to keep the original contents of /etc -- /origEtc or /etc-versionId anyone? etcmerge keeps it in /var/db/etc * A way to ensure that installation populates that place with the needed redundant copy of the bits, either by including the additional instance within the distributions or by generating it in the course of installation. The former would likely be easier, if only because the latter would need to work for all installation methods. IMO it is OK to fall back to a 2 way diff if it doesn't exist (ie the first time you run it) -- Daniel O'Connor software and network engineer for Genesis Software - http://www.gsoft.com.au The nice thing about standards is that there are so many of them to choose from. -- Andrew Tanenbaum GPG Fingerprint - 5596 B766 97C0 0E94 4347 295E E593 DC20 7B3F CE8C signature.asc Description: This is a digitally signed message part.
mergemaster annoyance or not?
Hello! As long time FreeBSD user I am concerned about RELEASE and STABLE configuration files inconsistency. No big deal but really annoying if you want to upgrade systems occassionally. The problem is that there is huge amount of old files between RELEASE and STABLE config files- more precisely lots of older config files in STABLE that is really strange considered that it should be much newer than RELEASE. FE: -# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.37.18.1 2008/11/25 02:59:29 kensmith Exp $ +# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.37 2004/10/07 13:55:26 mtm Exp $ -# $FreeBSD: src/etc/rc.d/newsyslog,v 1.5.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $ +# $FreeBSD: src/etc/rc.d/newsyslog,v 1.5.2.1 2008/01/28 07:55:44 dougb Exp $ -# $FreeBSD: src/etc/rc.d/nfsclient,v 1.6.6.1 2008/11/25 02:59:29 kensmith Exp $ +# $FreeBSD: src/etc/rc.d/nfsclient,v 1.6 2006/12/31 10:37:18 yar Exp $ -# $FreeBSD: src/etc/rc.d/nfsd,v 1.13.10.1.2.1 2008/11/25 02:59:29 kensmith Exp $ +# $FreeBSD: src/etc/rc.d/nfsd,v 1.13.10.1 2008/01/28 07:55:44 dougb Exp $ -# $FreeBSD: src/etc/crontab,v 1.32.32.1 2008/11/25 02:59:29 kensmith Exp $ +# $FreeBSD: src/etc/crontab,v 1.32 2002/11/22 16:13:39 tom Exp $ Oh, and why I have to remove myself from the system? I don't get it. Same problem with master.password file- why the hell I have to change that? -# $FreeBSD: src/etc/group,v 1.35.6.1 2008/11/25 02:59:29 kensmith Exp $ +# $FreeBSD: src/etc/group,v 1.35 2007/06/11 18:36:39 ceri Exp $ # -wheel:*:0:root,antik +wheel:*:0:root daemon:*:1: kmem:*:2: sys:*:3: @@ -29,4 +29,3 @@ www:*:80: nogroup:*:65533: nobody:*:65534: -antik:*:1001: How comes that difference is 4 years? Of course files are identical but this is annoying to go through files that is not changed at all. Some files are newer- that's expected BTW. Please syncronize your cvs between releases. ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: mergemaster annoyance or not?
On Thu, 12 Mar 2009, Andrei Kolu wrote: Hello! As long time FreeBSD user I am concerned about RELEASE and STABLE configuration files inconsistency. This topic was covered recently, you might want to check the archives. -# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.37.18.1 2008/11/25 02:59:29 kensmith Exp $ +# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.37 2004/10/07 13:55:26 mtm Exp $ What you're seeing is an artifact of the way that CVS deals with cutting a release. Even though the content of the files is the same, the CVS Id is updated in the release branch so that you can track revisions to that file that occur within that branch (e.g., RELENG_6_4), as opposed to the changes that occur in the parent branch (RELENG_6). This is a feature. You can easily deal with this in mergemaster by using the -U option (please see the man page). If you're dealing with the problem of a clean installation from a -RELEASE CD (or similar) upgrading to the stable branch for the first time, -U won't help you unfortunately. But it will help you on each successive update. For that first update what I usually do is 'rm -r /etc/rc.d/* /etc/periodic/* /etc/defaults/*' and then use mergemaster's -i option. That will cover the majority of the problem. hope this helps, Doug -- This .signature sanitized for your protection ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
