| 1 |
On 08/01/2012 03:19 AM, Pacho Ramos wrote: |
| 2 |
> On every openrc update I get dispatch-conf wanting to revert all my |
| 3 |
> changes in /etc/conf.d files, like KEYMAP, clock... |
| 4 |
> |
| 5 |
> Is there any way to prevent it from doing that? |
| 6 |
> |
| 7 |
> Thanks a lot for the info |
| 8 |
> |
| 9 |
|
| 10 |
Maybe we can trace the behavior back to the diff3 command that it's |
| 11 |
using. Inside /usr/lib/portage/pym/portage/dispatch_conf.py we have this |
| 12 |
command: |
| 13 |
|
| 14 |
DIFF3_MERGE = "diff3 -mE '%s' '%s' '%s' > '%s'" |
| 15 |
|
| 16 |
Are you able to reproduce the problem by running this command manually? |
| 17 |
|
| 18 |
Something like this: |
| 19 |
|
| 20 |
diff3 -mR /etc/conf.d/hostname \ |
| 21 |
/etc/config-archive/etc/conf.d/hostname.dist \ |
| 22 |
/etc/conf.d/._cfg0000_hostname > /tmp/mrgconf |
| 23 |
-- |
| 24 |
Thanks, |
| 25 |
Zac |
Archives