| 1 |
El mié, 01-08-2012 a las 16:14 -0700, Zac Medico escribió: |
| 2 |
> On 08/01/2012 03:19 AM, Pacho Ramos wrote: |
| 3 |
> > On every openrc update I get dispatch-conf wanting to revert all my |
| 4 |
> > changes in /etc/conf.d files, like KEYMAP, clock... |
| 5 |
> > |
| 6 |
> > Is there any way to prevent it from doing that? |
| 7 |
> > |
| 8 |
> > Thanks a lot for the info |
| 9 |
> > |
| 10 |
> |
| 11 |
> Maybe we can trace the behavior back to the diff3 command that it's |
| 12 |
> using. Inside /usr/lib/portage/pym/portage/dispatch_conf.py we have this |
| 13 |
> command: |
| 14 |
> |
| 15 |
> DIFF3_MERGE = "diff3 -mE '%s' '%s' '%s' > '%s'" |
| 16 |
> |
| 17 |
> Are you able to reproduce the problem by running this command manually? |
| 18 |
> |
| 19 |
> Something like this: |
| 20 |
> |
| 21 |
> diff3 -mR /etc/conf.d/hostname \ |
| 22 |
> /etc/config-archive/etc/conf.d/hostname.dist \ |
| 23 |
> /etc/conf.d/._cfg0000_hostname > /tmp/mrgconf |
| 24 |
|
| 25 |
I will probably need to reemerge it as I already merged changes and |
| 26 |
re-edited config files. Anyway, diff3 looks to not admit -R option: |
| 27 |
$ diff3 |
| 28 |
-mR /etc/conf.d/hostname /etc/config-archive/etc/conf.d/hostname.dist /etc/conf.d/._cfg0000_hostname |
| 29 |
diff3: opción inválida -- R |
| 30 |
diff3: Pruebe `diff3 --help' para más información. |
Archives