[src/netbsd-8]: src Pull up following revision(s) (requested by mlelstv in ti...

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

details:   https://anonhg.NetBSD.org/src/rev/22a6a8ec2794
branches:  netbsd-8
changeset: 851026:22a6a8ec2794
user:      snj <snj%NetBSD.org@localhost>
date:      Sat Sep 23 17:01:59 2017 +0000

description:
Pull up following revision(s) (requested by mlelstv in ticket #275):
        distrib/amiga/miniroot/install.md: revision 1.28
        distrib/miniroot/install.sub: revision 1.46
        distrib/notes/amiga/install: revision 1.36
        sys/arch/amiga/amiga/disksubr.c: revision 1.68
Support installing from a CD9660 formatted disk partition.
--
Fix check of AmigaDOS environment vector for nonstandard disklabel values.
Don't set a default fsize for CD9660 partitions, the CD9660 filesystem
interprets it as a session offset.
--
Ask for the boot command. It's necessary for some hardware
configurations and also to enable a serial console in the installed
system.
--
Mention the installer question for the boot command.

diffstat:

 distrib/amiga/miniroot/install.md |   6 ++++--
 distrib/miniroot/install.sub      |   7 ++++---
 distrib/notes/amiga/install       |   4 ++--
 sys/arch/amiga/amiga/disksubr.c   |  10 +++++++---
 4 files changed, 17 insertions(+), 10 deletions(-)

diffs (106 lines):

diff -r b800ecdde1dd -r 22a6a8ec2794 distrib/amiga/miniroot/install.md
--- a/distrib/amiga/miniroot/install.md Mon Sep 11 05:45:46 2017 +0000
+++ b/distrib/amiga/miniroot/install.md Sat Sep 23 17:01:59 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: install.md,v 1.27 2009/05/24 22:59:18 mlelstv Exp $
+#      $NetBSD: install.md,v 1.27.40.1 2017/09/23 17:01:59 snj Exp $
 #
 #
 # Copyright (c) 1996,2006 The NetBSD Foundation, Inc.
@@ -90,8 +90,10 @@
                getresp "y"
                case "$resp" in
                        y*|Y*)
+                               echo -n "Boot command? [netbsd -ASn2] "
+                               getresp "netbsd -ASn2"
                                echo "Installing boot block..."
-                               chroot /mnt /usr/sbin/installboot /dev/r${1}a /usr/mdec/bootxx_ffs
+                               chroot /mnt /usr/sbin/installboot -o command="$resp" /dev/r${1}a /usr/mdec/bootxx_ffs
                                cp -p /mnt/usr/mdec/boot.amiga /mnt/
                                ;;
                        *)
diff -r b800ecdde1dd -r 22a6a8ec2794 distrib/miniroot/install.sub
--- a/distrib/miniroot/install.sub      Mon Sep 11 05:45:46 2017 +0000
+++ b/distrib/miniroot/install.sub      Sat Sep 23 17:01:59 2017 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-#      $NetBSD: install.sub,v 1.45 2008/04/30 13:10:48 martin Exp $
+#      $NetBSD: install.sub,v 1.45.56.1 2017/09/23 17:01:59 snj Exp $
 #
 # Copyright (c) 1996 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1045,11 +1045,12 @@
 
 The following filesystem types are supported:
        1) ffs
+       2) cd9660
 __mount_a_disk_2
        _md_fstype=`md_native_fstype`
        _md_fsopts=`md_native_fsopts`
        if [ ! -z "$_md_fstype" ]; then
-               echo "  2) $_md_fstype"
+               echo "  3) $_md_fstype"
        else
                _md_fstype="_undefined_"
        fi
@@ -1058,7 +1059,7 @@
                echo -n "Which filesystem type? [ffs] "
                getresp "ffs"
                case "$resp" in
-                       ffs)
+                       ffs|cd9660)
                                _fstype=$resp
                                _fsopts="ro"
                                ;;
diff -r b800ecdde1dd -r 22a6a8ec2794 distrib/notes/amiga/install
--- a/distrib/notes/amiga/install       Mon Sep 11 05:45:46 2017 +0000
+++ b/distrib/notes/amiga/install       Sat Sep 23 17:01:59 2017 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: install,v 1.35 2009/04/23 01:56:48 snj Exp $
+.\"    $NetBSD: install,v 1.35.40.1 2017/09/23 17:01:59 snj Exp $
 .\"
 .\" Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -290,7 +290,7 @@
 If you did install the kern.tgz kernel, you normally should answer "n".
 .Pp
 Finally, the installer asks you if you want to install the bootblock
-code on your root disk.
+code on your root disk and, if yes, what boot command it should execute.
 This is a matter of personal choice and can also be done from a running
 .Nx
 system.
diff -r b800ecdde1dd -r 22a6a8ec2794 sys/arch/amiga/amiga/disksubr.c
--- a/sys/arch/amiga/amiga/disksubr.c   Mon Sep 11 05:45:46 2017 +0000
+++ b/sys/arch/amiga/amiga/disksubr.c   Sat Sep 23 17:01:59 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disksubr.c,v 1.67 2017/03/12 21:02:47 mlelstv Exp $    */
+/*     $NetBSD: disksubr.c,v 1.67.6.1 2017/09/23 17:02:00 snj Exp $    */
 
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.67 2017/03/12 21:02:47 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.67.6.1 2017/09/23 17:02:00 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -464,10 +464,14 @@
                                adt.archtype = ADT_UNKNOWN;
                                adt.fstype = FS_UNUSED;
                        }
-               } else if (pbp->e.tabsize > 22 && ISFSARCH_NETBSD(adt)) {
+               } else if (pbp->e.tabsize >= 22 && ISFSARCH_NETBSD(adt)) {
                        pp->p_fsize = pbp->e.fsize;
                        pp->p_frag = pbp->e.frag;
                        pp->p_cpg = pbp->e.cpg;
+               } else if (adt.fstype == FS_ISO9660) {
+                       pp->p_fsize = 0;
+                       pp->p_frag = 0;
+                       pp->p_cpg = 0;
                } else {
                        pp->p_fsize = 1024;
                        pp->p_frag = 8;