NetBSD Problem Report #9615
Received: (qmail 4118 invoked from network); 14 Mar 2000 04:31:21 -0000
Message-Id: <Pine.BSI.3.96.1000313232714.10831A-100000@doit.pgh.net>
Date: Mon, 13 Mar 2000 23:31:06 -0500 (EST)
From: Matthew Orgass <darkstar@pgh.net>
To: gnats-bugs@gnats.netbsd.org
Subject: sysinst default ftp directory is wrong for snapshots
>Number: 9615
>Category: install
>Synopsis: sysinst default ftp directory is wrong for snapshots
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: lukem
>State: closed
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Mon Mar 13 20:33:00 +0000 2000
>Closed-Date: Thu Jun 06 10:02:44 +0000 2002
>Last-Modified: Thu Jun 06 10:02:44 +0000 2002
>Originator: Matthew Orgass
>Release: 1.4
>Organization:
>Environment:
>Description:
The default ftp directory given by sysinst is
"pub/NetBSD/NetBSD-REL/MACH/binary/sets". However, snapshots are usually
located in "pub/NetBSD/arch/MACH/snapshot/DATE/binary/sets" where DATE is
`date +'%Y%m%d'`.
Noticed by Leonard Sitongia.
>How-To-Repeat:
Use sysinst when installing a snapshot via ftp.
>Fix:
This patch defines SNAPSHOT and sets REL to `date +'%Y%m%d'` when
${VER:M*[0-9][A-Z]}. ftp_dir is set to:
"pub/NetBSD/arch/" MACH "/snapshot/" REL "/binary/sets"
if SNAPSHOT is defined or otherwise
"pub/NetBSD/NetBSD-" REL "/" MACH "/binary/sets"
ftp_prefix is changed to cdrom_prefix and used only in creating
cdrom_dir (which is also likely to be broken for snapshot installs, though
I suspect there are not many people who install snapshots from cd).
--- distrib/utils/sysinst/Makefile.inc.old Sun Mar 12 23:57:19 2000
+++ distrib/utils/sysinst/Makefile.inc Mon Mar 13 00:33:23 2000
@@ -14,8 +14,15 @@
VER != sh ${.CURDIR}/../../../../../sys/conf/osrelease.sh
.endif
+.if ${VER:M*[0-9][A-Z]}
+VER != date +'%Y%m%d'
+SNAPFLAGS= -DSNAPSHOT
+.else
+SNAPFLAGS=
+.endif
+
CPPFLAGS+= -I. -I${.CURDIR}/../.. -I${.CURDIR} \
- -DREL=\"${VER}\" -DMACH=\"${MACHINE}\"
+ -DREL=\"${VER}\" -DMACH=\"${MACHINE}\" ${SNAPFLAGS}
MKMAN=no
--- distrib/utils/sysinst/defs.h.old Sun Mar 12 23:56:57 2000
+++ distrib/utils/sysinst/defs.h Mon Mar 13 00:45:00 2000
@@ -180,8 +180,13 @@
EXTERN char ext_dir[STRSIZE] INIT("");
EXTERN char ftp_host[STRSIZE] INIT("ftp.netbsd.org");
-EXTERN char ftp_dir[STRSIZE] INIT("pub/NetBSD/NetBSD-");
-EXTERN char ftp_prefix[STRSIZE] INIT("/binary/sets");
+#ifdef SNAPSHOT
+EXTERN char ftp_dir[STRSIZE]
+ INIT("pub/NetBSD/arch/" MACH "/snapshot/" REL "/binary/sets");
+#else
+EXTERN char ftp_dir[STRSIZE]
+ INIT("pub/NetBSD/NetBSD-" REL "/" MACH "/binary/sets");
+#endif
EXTERN char ftp_user[STRSIZE] INIT("ftp");
EXTERN char ftp_pass[STRSIZE] INIT("");
@@ -190,6 +195,7 @@
EXTERN char cdrom_dev[SSTRSIZE] INIT("cd0");
EXTERN char cdrom_dir[STRSIZE] INIT("/");
+EXTERN char cdrom_prefix[STRSIZE] INIT("/binary/sets");
EXTERN char localfs_dev[SSTRSIZE] INIT("sd0");
EXTERN char localfs_fs[SSTRSIZE] INIT("ffs");
--- distrib/utils/sysinst/net.c.old Mon Mar 13 00:40:36 2000
+++ distrib/utils/sysinst/net.c Mon Mar 13 00:48:05 2000
@@ -642,11 +642,6 @@
cd_dist_dir("ftp");
- /* Fill in final values for ftp_dir. */
- strncat(ftp_dir, rel, STRSIZE - strlen(ftp_dir));
- strcat(ftp_dir, "/");
- strncat(ftp_dir, machine, STRSIZE - strlen(ftp_dir));
- strncat(ftp_dir, ftp_prefix, STRSIZE - strlen(ftp_dir));
process_menu(MENU_ftpsource);
list = dist_list;
--- distrib/utils/sysinst/main.c.old Mon Mar 13 00:45:36 2000
+++ distrib/utils/sysinst/main.c Mon Mar 13 00:46:49 2000
@@ -250,13 +250,13 @@
static char *ext_dir_ptr = ext_dir;
static char *ftp_host_ptr = ftp_host;
static char *ftp_dir_ptr = ftp_dir;
-static char *ftp_prefix_ptr = ftp_prefix;
static char *ftp_user_ptr = ftp_user;
static char *ftp_pass_ptr = ftp_pass;
static char *nfs_host_ptr = nfs_host;
static char *nfs_dir_ptr = nfs_dir;
static char *cdrom_dev_ptr = cdrom_dev;
static char *cdrom_dir_ptr = cdrom_dir;
+static char *cdrom_prefix_ptr = cdrom_prefix;
static char *localfs_dev_ptr = localfs_dev;
static char *localfs_fs_ptr = localfs_fs;
static char *localfs_dir_ptr = localfs_dir;
@@ -271,14 +271,14 @@
{"ext dir", "ext dir = %s", "a $0", &ext_dir_ptr, 1, STRSIZE, NULL},
{"ftp host", "ftp host = %s", "a $0", &ftp_host_ptr, 1, STRSIZE, NULL},
{"ftp dir", "ftp dir = %s", "a $0", &ftp_dir_ptr, 1, STRSIZE, NULL},
- {"ftp prefix", "ftp prefix = %s", "a $0", &ftp_prefix_ptr, 1,
- STRSIZE, NULL},
{"ftp user", "ftp user = %s", "a $0", &ftp_user_ptr, 1, STRSIZE, NULL},
{"ftp pass", "ftp pass = %s", "a $0", &ftp_pass_ptr, 1, STRSIZE, NULL},
{"nfs host", "nfs host = %s", "a $0", &nfs_host_ptr, 1, STRSIZE, NULL},
{"nfs dir", "ftp dir = %s", "a $0", &nfs_dir_ptr, 1, STRSIZE, NULL},
{"cd dev", "cd dev = %s", "a $0", &cdrom_dev_ptr, 1, STRSIZE, NULL},
{"cd dir", "cd dir = %s", "a $0", &cdrom_dir_ptr, 1, STRSIZE, NULL},
+ {"cd prefix", "cdrom prefix = %s", "a $0", &cdrom_prefix_ptr, 1,
+ STRSIZE, NULL},
{"local dev", "local dev = %s", "a $0", &localfs_dev_ptr, 1, STRSIZE,
NULL},
{"local fs", "local fs = %s", "a $0", &localfs_fs_ptr, 1, STRSIZE,
--- distrib/utils/sysinst/util.c.old Mon Mar 13 00:45:09 2000
+++ distrib/utils/sysinst/util.c Mon Mar 13 00:45:19 2000
@@ -252,7 +252,7 @@
* same as the ftp site.
*/
strncat(cdrom_dir, machine, STRSIZE - strlen(cdrom_dir));
- strncat(cdrom_dir, ftp_prefix, STRSIZE - strlen(cdrom_dir));
+ strncat(cdrom_dir, cdrom_prefix, STRSIZE - strlen(cdrom_dir));
/* Get CD-rom device name and path within CD-rom */
process_menu(MENU_cdromsource);
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: install-manager->lukem
Responsible-Changed-By: lukem
Responsible-Changed-When: Thu Jun 6 00:36:19 PDT 2002
Responsible-Changed-Why:
i have a fix
State-Changed-From-To: open->closed
State-Changed-By: lukem
State-Changed-When: Thu Jun 6 02:59:11 PDT 2002
State-Changed-Why:
I've added mk.conf support for SYSINST_FTP_HOST, SYSINST_FTP_DIR
and SYSINST_CDROM_DIR.
To override the default ftp path for a snapshot directory, set
SYSINST_FTP_DIR to something like
"pub/NetBSD/arch/${MACHINE}/snapshot/`date +'%Y%m%d'`"
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.