Module Name:	basesrc
Committed By:	hubertf
Date:		Fri Sep  8 23:57:20 UTC 2000

Modified Files:
	basesrc/distrib/utils/sysinst [netbsd-1-5]: defs.h msg.mi.en target.c
	    upgrade.c

Log Message:
Pull up to netbsd-1-5 branch, OK'd by thorpej:

Revisions:
 > cvs rdiff -r1.55 -r1.56 basesrc/distrib/utils/sysinst/defs.h
 > cvs rdiff -r1.65 -r1.66 basesrc/distrib/utils/sysinst/msg.mi.en
 > cvs rdiff -r1.22 -r1.23 basesrc/distrib/utils/sysinst/target.c
 > cvs rdiff -r1.20 -r1.21 basesrc/distrib/utils/sysinst/upgrade.c

Log message:
 > When upgrading and /usr/X11R6/bin/X is a symlink, move it aside (X.old)
 > before extracting sets, and move it back afterwards, to save the information
 > which X server to use.
 >
 > Adresses PR 10935 by Dan McMahill <dmcmahill@netbsd.org>


To generate a diff of this commit:
cvs rdiff -r1.53.2.1 -r1.53.2.2 basesrc/distrib/utils/sysinst/defs.h
cvs rdiff -r1.62.2.3 -r1.62.2.4 basesrc/distrib/utils/sysinst/msg.mi.en
cvs rdiff -r1.22 -r1.22.10.1 basesrc/distrib/utils/sysinst/target.c
cvs rdiff -r1.20 -r1.20.10.1 basesrc/distrib/utils/sysinst/upgrade.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.