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

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

details:   https://anonhg.NetBSD.org/src/rev/191747558bfa
branches:  netbsd-2-0
changeset: 561332:191747558bfa
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Jun 07 10:21:16 2004 +0000

description:
Pull up revision 1.114 (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/defs.h |  30 ++++++++++++++----------------
 1 files changed, 14 insertions(+), 16 deletions(-)

diffs (69 lines):

diff -r 9e7eaf921136 -r 191747558bfa distrib/utils/sysinst/defs.h
--- a/distrib/utils/sysinst/defs.h      Mon Jun 07 10:21:10 2004 +0000
+++ b/distrib/utils/sysinst/defs.h      Mon Jun 07 10:21:16 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: defs.h,v 1.111.2.1 2004/05/22 16:23:18 he Exp $        */
+/*     $NetBSD: defs.h,v 1.111.2.2 2004/06/07 10:21:16 tron Exp $      */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -232,37 +232,36 @@
 #endif
 
 #if !defined(SYSINST_FTP_DIR)
-#define SYSINST_FTP_DIR                "pub/NetBSD/NetBSD-" REL "/" MACH
+#define SYSINST_FTP_DIR                "pub/NetBSD/NetBSD-" REL
 #endif
 
-#if !defined(SYSINST_CDROM_DIR)
-#define SYSINST_CDROM_DIR      "/" MACH
-#endif
+/* Abs. path we extract from */
+EXTERN char ext_dir[STRSIZE] INIT("");
 
-EXTERN char ext_dir[STRSIZE] INIT("");
+/* Place we look in all fs types */
+EXTERN char set_dir[STRSIZE] INIT("/" MACH "/binary/sets");
+
 EXTERN char ftp_host[STRSIZE] INIT(SYSINST_FTP_HOST);
 EXTERN char ftp_dir[STRSIZE]  INIT(SYSINST_FTP_DIR);
-EXTERN char ftp_prefix[STRSIZE] INIT("/binary/sets");
-EXTERN char ftp_user[STRSIZE] INIT("ftp");
+EXTERN char ftp_user[SSTRSIZE] INIT("ftp");
 EXTERN char ftp_pass[STRSIZE] INIT("");
 EXTERN char ftp_proxy[STRSIZE] INIT("");
 
 EXTERN char nfs_host[STRSIZE] INIT("");
-EXTERN char nfs_dir[STRSIZE] INIT("");
+EXTERN char nfs_dir[STRSIZE] INIT("/bsd/release");
 
 EXTERN char cdrom_dev[SSTRSIZE] INIT("cd0a");
-EXTERN char cdrom_dir[STRSIZE] INIT(SYSINST_CDROM_DIR);
 
 EXTERN char localfs_dev[SSTRSIZE] INIT("sd0a");
 EXTERN char localfs_fs[SSTRSIZE] INIT("ffs");
-EXTERN char localfs_dir[STRSIZE] INIT("");
+EXTERN char localfs_dir[STRSIZE] INIT("release");
 
-EXTERN char targetroot_mnt[STRSIZE] INIT ("/targetroot");
-EXTERN char distfs_mnt[STRSIZE] INIT ("/mnt2");
+EXTERN char targetroot_mnt[SSTRSIZE] INIT ("/targetroot");
+EXTERN char distfs_mnt[SSTRSIZE] INIT ("/mnt2");
 
 EXTERN int  mnt2_mounted INIT(0);
 
-EXTERN char dist_postfix[STRSIZE] INIT(".tgz");
+EXTERN char dist_postfix[SSTRSIZE] INIT(".tgz");
 
 /* selescted sets */
 extern distinfo dist_list[];
@@ -365,8 +364,7 @@
 void   cd_dist_dir(const char *);
 void   show_cur_distsets(void);
 void   make_ramdisk_dir(const char *);
-void   ask_verbose_dist(void);
-int    get_and_unpack_sets(int, msg, msg);
+int    get_and_unpack_sets(int, msg, msg, msg);
 int    sanity_check(void);
 int    set_timezone(void);
 int    set_crypt_type(void);