I donot like using mergemaster ?

classic Classic list List threaded Threaded
11 messages Options
Reply | Threaded
Open this post in threaded view
|

I donot like using mergemaster ?

z_axis
I want to upgrade my freebsd 8.0  to 8.1.  I have read all the steps about upgrading freebsd. I feel mergemaster  is difficult to use e.g. which parameters should i use ?   (you may wish to use -U or -ai or -Fi)  
Reply | Threaded
Open this post in threaded view
|

Re: I donot like using mergemaster ?

Charlie Kester
On Sun 25 Jul 2010 at 18:17:09 PDT zaxis wrote:
>
>I want to upgrade my freebsd 8.0  to 8.1.  I have read all the steps about
>upgrading freebsd. I feel mergemaster  is difficult to use e.g. which
>parameters should i use ?   (you may wish to use -U or -ai or -Fi)

I usually use -p when invoking mergemaster before installworld, and -F
after.  I.e.:

...
# mergemaster -p
# make installworld
# mergemaster -F
...

I don't know what the other mergemaster options do, but I've never felt
the need for them.
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to "[hidden email]"
Reply | Threaded
Open this post in threaded view
|

Re: I donot like using mergemaster ?

Adam Vande More
On Sun, Jul 25, 2010 at 9:36 PM, Charlie Kester <[hidden email]>wrote:

> On Sun 25 Jul 2010 at 18:17:09 PDT zaxis wrote:
>
>>
>> I want to upgrade my freebsd 8.0  to 8.1.  I have read all the steps about
>> upgrading freebsd. I feel mergemaster  is difficult to use e.g. which
>> parameters should i use ?   (you may wish to use -U or -ai or -Fi)
>>
>
> I usually use -p when invoking mergemaster before installworld, and -F
> after.  I.e.:
>
> ...
> # mergemaster -p
> # make installworld
> # mergemaster -F
> ...
>

mergemaster -iFU

--
Adam Vande More
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to "[hidden email]"
Reply | Threaded
Open this post in threaded view
|

Re: I donot like using mergemaster ?

Mike Clarke-17
In reply to this post by z_axis
On Monday 26 July 2010, zaxis wrote:

> I want to upgrade my freebsd 8.0  to 8.1.  I have read all the steps
> about upgrading freebsd. I feel mergemaster  is difficult to use e.g.
> which parameters should i use ?   (you may wish to use -U or -ai or
> -Fi)

I have the following in /etc/mergemaster.rc instead of having to
remember the command line options each time:

# Install the new file if it differs only by VCS Id (-F)
FREEBSD_ID=yes
#
# Automatically upgrade files that have not been user modified (-U)
AUTO_UPGRADE=yes
#
# Automatically install files not on the system already (-i)
AUTO_INSTALL=yes
#
# Preserve files that you replace
PRESERVE_FILES=yes
#
# Delete stale files in /etc/rc.d without prompting
DELETE_STALE_RC_FILES=yes
#
# Compare /etc/rc.conf[.local] to /etc/defaults/rc.conf (-C)
COMP_CONFS=yes
#
######################################################
# The following options have no command line overrides
######################################################
#
# Files to always avoid comparing
IGNORE_FILES='/etc/motd /etc/printcap'
#
# Additional options for diff.  This will get unset when using -s.
DIFF_OPTIONS='-Bb'     # Ignore changes in whitespace

--
Mike Clarke
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to "[hidden email]"
Reply | Threaded
Open this post in threaded view
|

Re: I donot like using mergemaster ?

z_axis
that's great ! I will use /etc/mergemaster.rc to upgrade my FB 8.0.

Mike Clarke-17 wrote
On Monday 26 July 2010, zaxis wrote:

> I want to upgrade my freebsd 8.0  to 8.1.  I have read all the steps
> about upgrading freebsd. I feel mergemaster  is difficult to use e.g.
> which parameters should i use ?   (you may wish to use -U or -ai or
> -Fi)

I have the following in /etc/mergemaster.rc instead of having to
remember the command line options each time:

# Install the new file if it differs only by VCS Id (-F)
FREEBSD_ID=yes
#
# Automatically upgrade files that have not been user modified (-U)
AUTO_UPGRADE=yes
#
# Automatically install files not on the system already (-i)
AUTO_INSTALL=yes
#
# Preserve files that you replace
PRESERVE_FILES=yes
#
# Delete stale files in /etc/rc.d without prompting
DELETE_STALE_RC_FILES=yes
#
# Compare /etc/rc.conf[.local] to /etc/defaults/rc.conf (-C)
COMP_CONFS=yes
#
######################################################
# The following options have no command line overrides
######################################################
#
# Files to always avoid comparing
IGNORE_FILES='/etc/motd /etc/printcap'
#
# Additional options for diff.  This will get unset when using -s.
DIFF_OPTIONS='-Bb'     # Ignore changes in whitespace

--
Mike Clarke
_______________________________________________
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to "freebsd-questions-unsubscribe@freebsd.org"
Reply | Threaded
Open this post in threaded view
|

Re: I donot like using mergemaster ?

b.f.
In reply to this post by z_axis
On Monday 26 July 2010, zaxis wrote:
> I want to upgrade my freebsd 8.0  to 8.1.  I have read all the steps
> about upgrading freebsd. I feel mergemaster  is difficult to use e.g.
> which parameters should i use ?   (you may wish to use -U or -ai or
> -Fi)

Well, obviously you will get more out of mergemaster if you read the
manpage and take the time to decide which options will work best for
you.  But if you can't be bothered to do that, the suggested usage in
/usr/src/UPDATING works for most people.  Also, there is an
alternative to mergemaster that is supposed to be easier to use in
some ways: John Baldwin's new port, sysutils/etcupdate.  You may want
to take a look at that.


b.
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to "[hidden email]"
Reply | Threaded
Open this post in threaded view
|

Re: I donot like using mergemaster ?

krad-2
On 27 July 2010 11:09, b. f. <[hidden email]> wrote:

> On Monday 26 July 2010, zaxis wrote:
> > I want to upgrade my freebsd 8.0  to 8.1.  I have read all the steps
> > about upgrading freebsd. I feel mergemaster  is difficult to use e.g.
> > which parameters should i use ?   (you may wish to use -U or -ai or
> > -Fi)
>
> Well, obviously you will get more out of mergemaster if you read the
> manpage and take the time to decide which options will work best for
> you.  But if you can't be bothered to do that, the suggested usage in
> /usr/src/UPDATING works for most people.  Also, there is an
> alternative to mergemaster that is supposed to be easier to use in
> some ways: John Baldwin's new port, sysutils/etcupdate.  You may want
> to take a look at that.
>
>
> b.
> _______________________________________________
> [hidden email] mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-questions
> To unsubscribe, send any mail to "
> [hidden email]"
>


here is my mergemaster config. Modify the ignore files to suite your needs
then just run mergemaster without any switches. Its not perfect but works
for me fine.

# cat /etc/mergemaster.rc
AUTO_INSTALL=YES
AUTO_UPGRADE=YES
PRESERVE_FILES=yes
PRESERVE_FILES_DIR=/var/mergemaster/preserved-files-`date +%y%m%d-%H%M%S`

IGNORE_FILES="/etc/crontab /etc/fstab /etc/group /etc/hosts /etc/inetd.conf
/etc/make.conf /etc/master.passwd /etc/motd /etc/newsyslog.conf
/etc/ntp.conf /etc/ntp.drift /etc/profile /etc/rc.conf /etc/resolv.conf
/etc/services /etc/shells /etc/syslog.conf /etc/ssh/sshd_config
/etc/ssh/ssh_host_key /etc/ssh/ssh_host_key.pub /etc/ssh/ssh_host_rsa_key
/etc/ssh/ssh_host_rsa_key.pub /etc/passwd /etc/rc.conf.local
/etc/zfs/exports /etc//namedb/named.conf /etc/periodic.conf /etc/hosts.allow
/etc/hosts /etc/pf.conf /etc/sysctl.conf /etc/make.conf /etc/src.conf
/etc/mail/aliases /etc/mail/mailer.conf /etc/remote
/etc/mail/freebsd.mc/etc/mail/
freebsd.cf /etc/mail/freebsd.submit.mc /etc/mail/freebsd.submit.cf"
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to "[hidden email]"
Reply | Threaded
Open this post in threaded view
|

Re: I donot like using mergemaster ?

Frank Shute-2
In reply to this post by z_axis
On Mon, Jul 26, 2010 at 06:18:22PM -0700, zaxis wrote:
>
>
> that's great ! I will use /etc/mergemaster.rc to upgrade my FB 8.0.
>

You might also want to put this line in mergemaster.rc:

DIFF_OPTIONS='-I$FreeBSD:.*[$]'

That makes mergemaster ignore changes in the CVS tags.

With a good rc and a basic understanding of vi, you should be in good
shape to make progress.

I hated mergemaster when I first started using it but I love it now!

Now I have to learn to love the "mergemaster" that freebsd-update
uses...

Anybody know how to make it ignore CVS tags?


Regards,

--

 Frank

 Contact info: http://www.shute.org.uk/misc/contact.html


_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to "[hidden email]"
Reply | Threaded
Open this post in threaded view
|

Re: I donot like using mergemaster ?

krad-2
On 27 July 2010 13:31, Frank Shute <[hidden email]> wrote:

> On Mon, Jul 26, 2010 at 06:18:22PM -0700, zaxis wrote:
> >
> >
> > that's great ! I will use /etc/mergemaster.rc to upgrade my FB 8.0.
> >
>
> You might also want to put this line in mergemaster.rc:
>
> DIFF_OPTIONS='-I$FreeBSD:.*[$]'
>
> That makes mergemaster ignore changes in the CVS tags.
>
> With a good rc and a basic understanding of vi, you should be in good
> shape to make progress.
>
> I hated mergemaster when I first started using it but I love it now!
>
> Now I have to learn to love the "mergemaster" that freebsd-update
> uses...
>
> Anybody know how to make it ignore CVS tags?
>
>
> Regards,
>
> --
>
>  Frank
>
>  Contact info: http://www.shute.org.uk/misc/contact.html
>
>
> _______________________________________________
> [hidden email] mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-questions
> To unsubscribe, send any mail to "
> [hidden email]"
>

Personally I wouldn't touch the update tool. I like to stick to the tried
and tested cvsup, and make world method ive used for over 10 years
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to "[hidden email]"
Reply | Threaded
Open this post in threaded view
|

Re: I donot like using mergemaster ?

Anonymous-86
In reply to this post by Frank Shute-2
Frank Shute <[hidden email]> writes:

> On Mon, Jul 26, 2010 at 06:18:22PM -0700, zaxis wrote:
>>
>>
>> that's great ! I will use /etc/mergemaster.rc to upgrade my FB 8.0.
>>
>
> You might also want to put this line in mergemaster.rc:
>
> DIFF_OPTIONS='-I$FreeBSD:.*[$]'

I think it's already done by FREEBSD_ID (-F) in rc file.
_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to "[hidden email]"
Reply | Threaded
Open this post in threaded view
|

Re: I donot like using mergemaster ?

Frank Shute-2
On Tue, Jul 27, 2010 at 09:01:13PM +0400, Anonymous wrote:

>
> Frank Shute <[hidden email]> writes:
>
> > On Mon, Jul 26, 2010 at 06:18:22PM -0700, zaxis wrote:
> >>
> >>
> >> that's great ! I will use /etc/mergemaster.rc to upgrade my FB 8.0.
> >>
> >
> > You might also want to put this line in mergemaster.rc:
> >
> > DIFF_OPTIONS='-I$FreeBSD:.*[$]'
>
> I think it's already done by FREEBSD_ID (-F) in rc file.

Thanks for pointing that out. Also made me notice a bug in the
mergemaster manpage which I'll write a patch and pr for.


Regards,

--

 Frank

 Contact info: http://www.shute.org.uk/misc/contact.html


_______________________________________________
[hidden email] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to "[hidden email]"