Strange problem with diff3

Peter2121

Member

Reaction score: 20
Messages: 99

Hi,
I'm trying to manually upgrade a thin jail using etcupdate. The upgrade stops with the following error:
Code:
PANIC: merge failed with status 2
Adding an echo to etcupdate I've got the error command:
Code:
diff3 -E -m /jails/cbsd/jails/jab1/etc/pwd.db /jails/cbsd/jails-system/jab1/etcupdate/old/etc/pwd.db /jails/cbsd/jails-system/jab1/etcupdate/current/etc/pwd.db
diff3: subsidiary program `/usr/bin/diff' failed (exit status 2)
I can reproduce this error on any three different *.db files and on any path, for example:
Code:
diff3 -E -m 5/spwd.db 5/pwd.db 5/spwd.db
diff3: subsidiary program `/usr/bin/diff' failed (exit status 2)
What's happening? Is diff3 completely broken?
Any workaround is welcome!
PS I'm on 11.3-p5
 
Top