Re: [gentoo-dev] Portage config auto-update

[Matt Tucker]

-- Romans Malinovskis <romans@××××.lv> spake thusly:

>> I've implemented a new feature for Portage which alters the way it
>> handles config-protected files. Instead of creating ._cfg????_*
>> files, it copies installed config files to a tree under
>> /var/cache/edb/config_protect, keeping a separate copy for each
>> version installed and cleaning out old versions as config files are
>> updated (using etc-update).
>
> Just an idea:
>  portage could keep origital config files in a seperate directory
> structure  (somewhere in /var), when i install a new version of
> config file, it  generates a patch(agains old original config) and
> ask me, would i like to  apply that patch to existing config in /etc..

That's pretty much what I'm doing. The scenario works like this (if
config_automerge is enabled):

    emerge foo-1.0 (which has /etc/foo.conf)
    foo.conf -> /var/cache/edb/config_protect/etc/foo.conf/foo-1.0
    foo.conf -> /etc

    emerge foo-1.1 (which has /etc/foo.conf)
    foo.conf -> /var/cache/edb/config_protect/etc/foo.conf/foo-1.1
    diff /etc/foo.conf, /var/cache...foo-1.0 [no changes]
    foo.conf -> /etc
    delete /var/cache...foo-1.0

    emerge foo-1.2
    foo.conf -> /var/cache/edb/config_protect/etc/foo.conf/foo-1.2
    diff /etc/foo.conf, /var/cache...foo-1.1 [changes]
    merge /etc/foo.conf, /var/cache...foo-1.1,foo-1.2 [success]
    => result to /etc/foo.conf
    delete /var/cache...foo-1.1

    emerge foo-1.3
    foo.conf -> /var/cache/edb/config_protect/etc/foo.conf/foo-1.3
    diff /etc/foo.conf, /var/cache...foo-1.2 [changes]
    merge /etc/foo.conf, /var/cache...foo-1.2,foo-1.3 [conflicts]
    Message "1 config file needs updating"
    run etc-update
    merge /etc/foo.conf, foo-1.2, foo-1.3
    => resolve conflicts
    => result to /etc/foo.conf
    delete /var/cache...foo-1.2

If config_automerge is disabled, everything is the same except for the
automatic update of foo.conf during foo-1.2. Then it's just a matter of
doing it manually through etc-update.

So far it's been serving me quite well. Updating packages like
baselayout have generally required my intervention on at most one or
two files (often none). The feature needs to be extensively tested, of
course (messing up config files is not acceptable), but once it is I
think it'll be a stellar addition.


--
gentoo-dev@g.o mailing list