A smarter mergemaster

From: Yar Tikhiy (yar_at_comp.chem.msu.su)
Date: 09/30/05

  • Next message: Daniel O'Connor: "Re: A smarter mergemaster" 
    Date: Fri, 30 Sep 2005 02:45:48 +0400
To: hackers@freebsd.org, current@freebsd.org

    Folks,

    I've got tired of dumb default choices mergemaster(8) offers
    and modified it to be a bit smarter. Upgrading /etc often,
    as when following CURRENT, is much less pain to me now. The
    modified mergemaster is available from P4 for now since
    I'd like to have it tested well before it hits the src tree.
    The path is //depot/user/yar/hack/usr.sbin/mergemaster, also
    accessible via web as
    http://perforce.freebsd.org/depotTreeBrowser.cgi?FSPC=//depot/user/yar/hack/usr.sbin/mergemaster
    Since mergemaster still is a shell script, you can just grab
    and run it. The manual page there has been updated as well.

    The fruitiest features are as follows:

    - mergemaster no longer teases you with pauses in -v mode.
      Use -N (novice mode) if you still want the pauses.
    - "Stale" rc.d files can be rm'ed or kept on individual basis.
    - There is expert mode, -E. In this mode, mergemaster offers
      more dangerous defaults, mostly [install] or [delete] depending
      on the question. So you can just keep hitting Enter most of the
      time if your /etc is just slightly modified. In addition, you
      get the 's' choice when in a subdirectory: auto-install all files
      from this subdirectory -- much useful to deal with sweeping changes
      to rc.d or periodic.

    Feedback is welcome. And please please don't skip making a backup of
    your /etc before running mergemaster! I can't be responsible for its
    loss due to bugs in my code or whatever. 

    -- 
Yar
_______________________________________________
freebsd-hackers@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-hackers
To unsubscribe, send any mail to "freebsd-hackers-unsubscribe@freebsd.org"
  • Next message: Daniel O'Connor: "Re: A smarter mergemaster"

    Relevant Pages

    • A smarter mergemaster
      ... and modified it to be a bit smarter. ... Upgrading /etc often, ... Since mergemaster still is a shell script, ... Use -N if you still want the pauses. ...
      (freebsd-current)
    • Re: SMP and networking under FreeBSD 5.3
      ... If so, it does show that natd is running, ... bit I don't like is mergemaster, just because it's fiddly and hands on ... The handbook has a great section on upgrading. ... just summarise the relevant bits of config and the natd error you are ...
      (freebsd-questions)
    • Re: mergemaster feature suggestion...
      ... >> mergemaster always asks if you want to install a file which doesnt ... The most relevant document regarding upgrading in this context ... This person simply requested a feature for mergemaster. ...
      (freebsd-current)
    • About mergemaster (Re: upgrading)
      ... I had a lot of different words to say into the air while upgrading:) ... Most painful procedure for me is running mergemaster. ... Nick Barnes wrote: ... >>buildworld, make buildkernel KERNCONF=MILOWARE, then make ...
      (freebsd-stable)
    • Re: Default ssh protocol in -STABLE [was:
      ... default is a little different...and if people are blindly upgrading entire ... > FreeBSD-STABLEnowhas OpenSSH 3.4p1] ... >> mergemaster, see the change, and tell mergemaster to go ahead and merge ... >> or overwrite their config file. ...
      (FreeBSD-Security)