[src/netbsd-2-0]: src/distrib/utils/sysinst Pull up revision 1.48 (requested ...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9860586c0a44
branches:  netbsd-2-0
changeset: 561327:9860586c0a44
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Jun 07 10:20:45 2004 +0000

description:
Pull up revision 1.48 (requested by dsl in ticket #453):
A load of usability fixes mainly to network installs.
I've made the error retry loops go back as far as the input menus.
Split all the pathname inputs into 2 pieces (base directory and set directory).
Reduced the size of some fixed strings.
Stopped the install aborting if ftp can't find a set (eg the X ones).
The French and Polish transations don't differenciate between Base_dir and
Set_dir - but that can be fixed later.

diffstat:

 distrib/utils/sysinst/upgrade.c |  14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

diffs (35 lines):

diff -r 0d42665190a1 -r 9860586c0a44 distrib/utils/sysinst/upgrade.c
--- a/distrib/utils/sysinst/upgrade.c   Mon Jun 07 10:20:39 2004 +0000
+++ b/distrib/utils/sysinst/upgrade.c   Mon Jun 07 10:20:45 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: upgrade.c,v 1.44.2.1 2004/05/22 16:24:16 he Exp $      */
+/*     $NetBSD: upgrade.c,v 1.44.2.2 2004/06/07 10:20:45 tron Exp $    */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -104,14 +104,8 @@
                return;
 
        /* Done with disks. Ready to get and unpack tarballs. */
-       msg_display(MSG_disksetupdoneupdate);
-       getchar();
-       wrefresh(curscr);
-       wmove(stdscr, 0, 0);
-       wclear(stdscr);
-       wrefresh(stdscr);
-
-       if (get_and_unpack_sets(1, MSG_upgrcomplete, MSG_abortupgr) != 0)
+       if (get_and_unpack_sets(1, MSG_disksetupdoneupdate,
+           MSG_upgrcomplete, MSG_abortupgr) != 0)
                return;
 
 #if 0
@@ -291,7 +285,7 @@
                return;
 
        /* Unpack the distribution. */
-       if (get_and_unpack_sets(0, MSG_unpackcomplete, MSG_abortunpack) != 0)
+       if (get_and_unpack_sets(0, NULL, MSG_unpackcomplete, MSG_abortunpack) != 0)
                return;
 
        sanity_check();