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

===================================================================
RCS file: /ftp/cvs/cvsroot/src/distrib/utils/sysinst/Attic/install.c,v
rcsdiff: /ftp/cvs/cvsroot/src/distrib/utils/sysinst/Attic/install.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.7
retrieving revision 1.13.2.1
diff -u -p -r1.7 -r1.13.2.1
--- src/distrib/utils/sysinst/Attic/install.c	1997/11/03 06:18:08	1.7
+++ src/distrib/utils/sysinst/Attic/install.c	1999/04/19 15:19:27	1.13.2.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: install.c,v 1.7 1997/11/03 06:18:08 jonathan Exp $	*/
+/*	$NetBSD: install.c,v 1.13.2.1 1999/04/19 15:19:27 perry Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -46,57 +46,85 @@
 
 /* Do the system install. */
 
-void do_install(void)
+void
+do_install()
 {
-	doingwhat = msg_string (MSG_install);
+	doingwhat = msg_string(MSG_install);
 
-	msg_display (MSG_installusure);
-	process_menu (MENU_noyes);
+	msg_display(MSG_installusure);
+	process_menu(MENU_noyes);
 	if (!yesno)
 		return;
+#if 0
+	if (!askyesno(0))
+		return;
+#endif
 	
 	get_ramsize();
 
-	if (find_disks () < 0)
+	if (find_disks() < 0)
+		return;
+
+	/* if we need the user to mount root, ask them to. */
+	if (must_mount_root()) {
+		msg_display(MSG_pleasemountroot, diskdev, diskdev, diskdev);
+		process_menu(MENU_ok);
 		return;
+	}
 
-	if (!md_get_info ()) {
-		msg_display (MSG_abort);
+	if (!md_get_info()) {
+		msg_display(MSG_abort);
+		process_menu(MENU_ok);
 		return;
 	}
 
-	md_make_bsd_partitions ();
+	if (md_make_bsd_partitions() == 0) {
+		msg_display(MSG_abort);
+		process_menu(MENU_ok);
+		return;
+	}
 
 	/* Last chance ... do you really want to do this? */
-	msg_display (MSG_lastchance);
-	process_menu (MENU_noyes);
+	clear();
+	refresh();
+	msg_display(MSG_lastchance);
+	process_menu(MENU_noyes);
 	if (!yesno)
 		return;
 
-	/* Leave curses so program output looks good. */
-	endwin ();
-
-	md_pre_disklabel ();
+	if (md_pre_disklabel() != 0)
+		return;
 
-	write_disklabel ();
+	if (write_disklabel() != 0)
+		return;
 	
-	md_post_disklabel ();
+	if (md_post_disklabel() != 0)
+		return;
 
-	make_filesystems ();
+	if (make_filesystems())
+		return;
 
-	md_copy_filesystem ();
+	if (md_copy_filesystem() != 0)
+		return;
 
-	make_fstab();
+	if (make_fstab() != 0)
+		return;
 
-	md_post_newfs ();
+	if (md_post_newfs() != 0)
+		return;
 
 	/* Done to here. */
-	printf("%s", msg_string(MSG_disksetupdone));
+	msg_display(MSG_disksetupdone);
 
 	getchar();
-	puts (CL); /* just to make sure */
+	puts(CL); /* just to make sure */
+	wclear(stdscr);
 	wrefresh(stdscr);
 
 	/* Unpack the distribution. */
 	get_and_unpack_sets(MSG_instcomplete, MSG_abortinst);
+
+	sanity_check();
+
+	md_cleanup_install();
 }