-TODO: Remove names as they were source name rather than names of who should

do it.
-change install confirmation message to outline install process
-move english print text into msg.mi.eng.

distrib/utils/sysinst/TODO

@@ -1,6 +1,5 @@
 Things to do ....
 
-Phil:
 	-  Things like having config_network()
            possibly use the information on the fixed disk instead of having
            to ask everything.
@@ -20,8 +19,6 @@ Phil:
         -- Check-in of files for amiga and other ports that will use
            sysinst for 1.3.
 
-Jonathan:
-
     -- fix "disklabel -r -w" vs. "disklabel -w": I still don't grok why
         the  -r, and the manpage says it will lose totally on sparcs.
         Phil, was there some reason to bypass the incore label on i386?
@@ -41,14 +38,12 @@ Jonathan:
 	jump back to disklabel edit if any overlaps found.
 	needs to  skip getrawpartition() (and  c on i386).
 
-Somebody:
     --  remove any possibly-stale ld.so.cache files from the target
         /etc after unpacking sets. Maybe just don't copy ld.so.cache
         from /etc.old?
 
     --  set rc.configured, or just remind users to edit rc.conf?
 
-
     --  If we're doing a fresh install and there's already a label
 	on the disk, maybe use that intsead  of the compiled-in default
 	label?

distrib/utils/sysinst/main.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.3 1997/11/04 01:39:05 phil Exp $	*/
+/*	$NetBSD: main.c,v 1.4 1997/11/09 15:54:16 phil Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -101,6 +101,6 @@ int main(int argc, char **argv)
 void
 usage(void)
 {
-	(void)fprintf (stderr, "usage: sysinst [-r release]\n");
+	(void)fprintf (stderr, msg_string(MSG_usage));
 	exit(1);
 }

distrib/utils/sysinst/msg.mi.eng

@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.mi.eng,v 1.16 1997/11/09 12:47:11 jonathan Exp $	*/
+/*	$NetBSD: msg.mi.eng,v 1.17 1997/11/09 15:54:17 phil Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -38,6 +38,10 @@
 
 /* MI Message catalog -- english, machine independent */
 
+message usage
+{usage: sysinst [-r release]
+}
+
 message yes {Yes}
 
 message no {No}
@@ -61,11 +65,16 @@ Thank you for using NetBSD!
 }
 
 message installusure
-{Ok, lets get NetBSD installed on your hard disk.  As always, this will
-change information on your hard disk.  You should have made a full backup
-before this procedure!  Do you really want to install NetBSD?
-(You get one more warning before this procedure writes anything to your
-disk.)
+{You have chosen to install NetBSD on your hard disk.  This will change
+information on your hard disk.  You should have made a full backup
+before this procedure!  This procedure will do the following things:
+	a) Partition your disk
+	b) Create new BSD file systems
+	c) Load and install distribution sets
+
+(After you enter the partition information but before your disk is 
+changed, you will have the opportunity to quit this procedure.)
+Shall we continue?  
 }
 
 message upgradeusure
@@ -559,3 +568,12 @@ message tarerror
 were not extracted correctly and your system will not be complete.
 CR to continue
 }
+
+message etc_hosts
+{
+#
+#Added by NetBSD sysinst
+#
+%s %s.%s %s
+127.0.0.1 localhost
+}

distrib/utils/sysinst/net.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: net.c,v 1.16 1997/11/05 07:28:32 jonathan Exp $	*/
+/*	$NetBSD: net.c,v 1.17 1997/11/09 15:54:17 phil Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -295,14 +295,10 @@ mnt_net_config(void)
 			 */
 			f = target_fopen("/etc/hosts", "a");
 			if (f != 0) {
-				fprintf(f, "#\n");
-				fprintf(f, "#Added by NetBSD sysinst\n");
-				fprintf(f, "#\n");
-				fprintf(f, "%s %s\n", net_ip, net_host);
-				fprintf(f, "%s %s.%s\n", 
-					net_ip, net_host, net_domain);
-				fprintf(f, "127.0.0.1 localhost\n");
-				  fclose(f);
+				fprintf(f, msg_string(MSG_etc_hosts),
+					net_ip, net_host, net_domain,
+					net_host);
+				fclose(f);
 			}
 
 			/* Write IPaddr and netmask to /etc/ifconfig.if[0-9] */