[src/trunk]: src/distrib/utils/sysinst A few sysinst fixes:

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

details:   https://anonhg.NetBSD.org/src/rev/bc66cc6a0bae
branches:  trunk
changeset: 555355:bc66cc6a0bae
user:      sekiya <sekiya%NetBSD.org@localhost>
date:      Sat Nov 15 12:53:34 2003 +0000

description:
A few sysinst fixes:

        * use cd0a rather than cd0[cd] as the CDROM installation device.
          This fixes problems with platforms that install from iso9660 images
          encapsulated in a partition, and should not affect platforms that
          don't.
        * add RUN_PROGRESS to the run_prog() flags for ftp installs.

Okay'ed by David Laight.

diffstat:

 distrib/utils/sysinst/defs.h |  6 +++---
 distrib/utils/sysinst/net.c  |  6 +++---
 distrib/utils/sysinst/util.c |  5 ++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diffs (68 lines):

diff -r d2809d60a1c4 -r bc66cc6a0bae distrib/utils/sysinst/defs.h
--- a/distrib/utils/sysinst/defs.h      Sat Nov 15 12:44:54 2003 +0000
+++ b/distrib/utils/sysinst/defs.h      Sat Nov 15 12:53:34 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: defs.h,v 1.105 2003/10/19 20:17:31 dsl Exp $   */
+/*     $NetBSD: defs.h,v 1.106 2003/11/15 12:53:34 sekiya Exp $        */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -240,10 +240,10 @@
 EXTERN char nfs_host[STRSIZE] INIT("");
 EXTERN char nfs_dir[STRSIZE] INIT("");
 
-EXTERN char cdrom_dev[SSTRSIZE] INIT("cd0");
+EXTERN char cdrom_dev[SSTRSIZE] INIT("cd0a");
 EXTERN char cdrom_dir[STRSIZE] INIT(SYSINST_CDROM_DIR);
 
-EXTERN char localfs_dev[SSTRSIZE] INIT("sd0");
+EXTERN char localfs_dev[SSTRSIZE] INIT("sd0a");
 EXTERN char localfs_fs[SSTRSIZE] INIT("ffs");
 EXTERN char localfs_dir[STRSIZE] INIT("");
 
diff -r d2809d60a1c4 -r bc66cc6a0bae distrib/utils/sysinst/net.c
--- a/distrib/utils/sysinst/net.c       Sat Nov 15 12:44:54 2003 +0000
+++ b/distrib/utils/sysinst/net.c       Sat Nov 15 12:53:34 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: net.c,v 1.97 2003/11/04 16:27:22 perry Exp $   */
+/*     $NetBSD: net.c,v 1.98 2003/11/15 12:53:34 sekiya Exp $  */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -799,7 +799,7 @@
                 * unsafe by a strict reading of RFC 1738).
                 */
                if (strcmp("ftp", ftp_user) == 0 && ftp_pass[0] == 0)
-                       ret = run_prog(RUN_DISPLAY, NULL,
+                       ret = run_prog(RUN_DISPLAY | RUN_PROGRESS, NULL,
                            "/usr/bin/ftp -a ftp://%s/%s/%s";,
                            ftp_host,
                            url_encode(ftp_dir_encoded, ftp_dir,
@@ -807,7 +807,7 @@
                                        RFC1738_SAFE_LESS_SHELL_PLUS_SLASH, 1),
                            filename);
                else {
-                       ret = run_prog(RUN_DISPLAY, NULL,
+                       ret = run_prog(RUN_DISPLAY | RUN_PROGRESS, NULL,
                            "/usr/bin/ftp ftp://%s:%s@%s/%s/%s";,
                            url_encode(ftp_user_encoded, ftp_user,
                                        sizeof ftp_user_encoded,
diff -r d2809d60a1c4 -r bc66cc6a0bae distrib/utils/sysinst/util.c
--- a/distrib/utils/sysinst/util.c      Sat Nov 15 12:44:54 2003 +0000
+++ b/distrib/utils/sysinst/util.c      Sat Nov 15 12:53:34 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: util.c,v 1.113 2003/10/19 20:45:27 dsl Exp $   */
+/*     $NetBSD: util.c,v 1.114 2003/11/15 12:53:34 sekiya Exp $        */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -327,8 +327,7 @@
        /* Mount it */
        for (retries = 5;; --retries) {
                if (run_prog(retries > 0 ? RUN_SILENT : 0, NULL,
-                   "/sbin/mount -rt cd9660 /dev/%s%c /mnt2",
-                   cdrom_dev, 'a' + getrawpartition()) == 0)
+                   "/sbin/mount -rt cd9660 /dev/%s /mnt2", cdrom_dev) == 0)
                        break;
                if (retries > 0) {
                        sleep(1);