[src/netbsd-1-6]: src/distrib/utils/sysinst Pull up revision 1.70 (requested ...

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

details:   https://anonhg.NetBSD.org/src/rev/2daa350fecc4
branches:  netbsd-1-6
changeset: 527781:2daa350fecc4
user:      lukem <lukem%NetBSD.org@localhost>
date:      Thu Jun 06 09:58:16 2002 +0000

description:
Pull up revision 1.70 (requested by lukem in ticket #188):
- Replace make(1) and -D FTP_HOST with SYSINST_FTP_HOST.
  Defaults to "ftp.netbsd.org"
- Replace make(1) and -D FTP_DIR with SYSINST_FTP_DIR.
  Defaults to "pub/NetBSD/NetBSD-" + VER + "/" + MACH.
  (FTP_DIR used to override "pub/NetBSD/NetBSD-", which meant the
  path name had to contain the release version in it)
- Add make(1) and -D SYSINST_CDROM_DIR.
  Defaults to "/" + mach.
- only append ftp_prefix to ftp_dir and cdrom_dir once, just after
  the options are parsed.  Do this in newly added set_defaults().

diffstat:

 distrib/utils/sysinst/defs.h |  22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diffs (48 lines):

diff -r 2da6c478f843 -r 2daa350fecc4 distrib/utils/sysinst/defs.h
--- a/distrib/utils/sysinst/defs.h      Thu Jun 06 09:58:04 2002 +0000
+++ b/distrib/utils/sysinst/defs.h      Thu Jun 06 09:58:16 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: defs.h,v 1.69 2002/04/04 14:26:43 ad Exp $     */
+/*     $NetBSD: defs.h,v 1.69.2.1 2002/06/06 09:58:16 lukem Exp $      */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -196,19 +196,21 @@
 EXTERN int  clean_dist_dir INIT(0);
 /* Absolute path name where the distribution should be extracted from. */
 
-#if !defined(FTP_HOST)
-#define        FTP_HOST        ftp.netbsd.org
+#if !defined(SYSINST_FTP_HOST)
+#define        SYSINST_FTP_HOST        "ftp.netbsd.org"
+#endif
+
+#if !defined(SYSINST_FTP_DIR)
+#define        SYSINST_FTP_DIR         "pub/NetBSD/NetBSD-" REL "/" MACH
 #endif
 
-#if !defined(FTP_DIR)
-#define        FTP_DIR         pub/NetBSD/NetBSD-
+#if !defined(SYSINST_CDROM_DIR)
+#define        SYSINST_CDROM_DIR       "/" MACH
 #endif
 
-#define        STRING(x)       __STRING(x)
-
 EXTERN char ext_dir[STRSIZE] INIT("");
-EXTERN char ftp_host[STRSIZE] INIT(STRING(FTP_HOST));
-EXTERN char ftp_dir[STRSIZE]  INIT(STRING(FTP_DIR));
+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_pass[STRSIZE] INIT("");
@@ -218,7 +220,7 @@
 EXTERN char nfs_dir[STRSIZE] INIT("");
 
 EXTERN char cdrom_dev[SSTRSIZE] INIT("cd0");
-EXTERN char cdrom_dir[STRSIZE] INIT("/");
+EXTERN char cdrom_dir[STRSIZE] INIT(SYSINST_CDROM_DIR);
 
 EXTERN char localfs_dev[SSTRSIZE] INIT("sd0");
 EXTERN char localfs_fs[SSTRSIZE] INIT("ffs");