Module Name: src
Committed By: snj
Date: Sat Sep 23 17:02:00 UTC 2017
Modified Files:
src/distrib/amiga/miniroot [netbsd-8]: install.md
src/distrib/miniroot [netbsd-8]: install.sub
src/distrib/notes/amiga [netbsd-8]: install
src/sys/arch/amiga/amiga [netbsd-8]: disksubr.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.27.40.1 src/distrib/amiga/miniroot/install.md
cvs rdiff -u -r1.45 -r1.45.56.1 src/distrib/miniroot/install.sub
cvs rdiff -u -r1.35 -r1.35.40.1 src/distrib/notes/amiga/install
cvs rdiff -u -r1.67 -r1.67.6.1 src/sys/arch/amiga/amiga/disksubr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amiga/miniroot/install.md
diff -u src/distrib/amiga/miniroot/install.md:1.27 src/distrib/amiga/miniroot/install.md:1.27.40.1
--- src/distrib/amiga/miniroot/install.md:1.27 Sun May 24 22:59:18 2009
+++ src/distrib/amiga/miniroot/install.md Sat Sep 23 17:01:59 2017
@@ -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 @@ md_installboot() {
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/
;;
*)
Index: src/distrib/miniroot/install.sub
diff -u src/distrib/miniroot/install.sub:1.45 src/distrib/miniroot/install.sub:1.45.56.1
--- src/distrib/miniroot/install.sub:1.45 Wed Apr 30 13:10:48 2008
+++ src/distrib/miniroot/install.sub Sat Sep 23 17:01:59 2017
@@ -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 @@ mount_a_disk() {
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 @@ __mount_a_disk_2
echo -n "Which filesystem type? [ffs] "
getresp "ffs"
case "$resp" in
- ffs)
+ ffs|cd9660)
_fstype=$resp
_fsopts="ro"
;;
Index: src/distrib/notes/amiga/install
diff -u src/distrib/notes/amiga/install:1.35 src/distrib/notes/amiga/install:1.35.40.1
--- src/distrib/notes/amiga/install:1.35 Thu Apr 23 01:56:48 2009
+++ src/distrib/notes/amiga/install Sat Sep 23 17:01:59 2017
@@ -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 @@ kern.tgz distribution set, this is an ol
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.
Index: src/sys/arch/amiga/amiga/disksubr.c
diff -u src/sys/arch/amiga/amiga/disksubr.c:1.67 src/sys/arch/amiga/amiga/disksubr.c:1.67.6.1
--- src/sys/arch/amiga/amiga/disksubr.c:1.67 Sun Mar 12 21:02:47 2017
+++ src/sys/arch/amiga/amiga/disksubr.c Sat Sep 23 17:02:00 2017
@@ -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 @@ readdisklabel(dev_t dev, void (*strat)(s
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;
