>Number:         23162
>Category:       misc
>Synopsis:       etcupdate/sdiff report error on applying merge edits
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    misc-bug-people
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Oct 15 00:30:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     George Michaelson
>Release:        NetBSD 1.6ZC
>Organization:
APNIC Pty/Ltd
>Environment:
System: NetBSD garlic.apnic.net 1.6ZC NetBSD 1.6ZC (GGMSMALL) #6: Tue Oct 14 16:28:45 EST 2003 root@garlic.apnic.net:/sys/arch/i386/compile/GGMSMALL i386
Architecture: i386
Machine: i386
>Description:

	I do installs by (cd /usr/src; ./build -u build;) followed
	by shutdown to single user, and then in / (cd /usr/obj/destdir.i386;
	tar cBpf - . ) | tar --unlink -xBpf -; followed by etcupdate.

	during etcupdate, I attempt to merge files, but every time, when
	I exit the sdiff merge process, I am told edit failed. It does
	this irrespective of ${EDITOR} and its a bit bizarre that its
	exposed to this value: It should use ed as the canonical editor
	not an env set value.

	The prompting after merge is also extremely confusing: no option
	appears to apply, once you've done a merge. The etcupdate script
	needs to recognize a merge was done and give you a:

		x)	do nothing, the merge is ok thanks

	option

>How-To-Repeat:
	do an upgrade, run etcupdate and attempt to merge a file such
	as /etc/passwd or /etc/inetd.conf.

>Fix:
	
>Release-Note:
>Audit-Trail:
>Unformatted: