Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-5]: src fix sysinst floppy for NetBSD/sparc, plus small doc fix.
details: https://anonhg.NetBSD.org/src/rev/55a885c1fa92
branches: netbsd-1-5
changeset: 489199:55a885c1fa92
user: abs <abs%NetBSD.org@localhost>
date: Tue Aug 22 16:06:30 2000 +0000
description:
fix sysinst floppy for NetBSD/sparc, plus small doc fix.
Approved by thorpej, pullup list:
distrib/notes/sparc/install 1.24
distrib/sparc/bootfs.sysinst/Makefile 1.5
distrib/sparc/list2sh.awk 1.4
distrib/sparc/ramdisk.sysinst/Makefile 1.8
distrib/sparc/ramdisk.sysinst/disktab 1.2
distrib/sparc/ramdisk.sysinst/disktab.preinstall delete
distrib/sparc/ramdisk.sysinst/dot.profile.m4 1.5
distrib/sparc/ramdisk.sysinst/list.m4 1.6
distrib/sparc/ramdisk.sysinst/mtree.conf 1.2
distrib/sparc/ramdisk.sysinst/ramdiskbin.m4 1.4
distrib/utils/libhack/Makefile.inc 1.10
sys/arch/sparc/conf/INSTALL 1.17
diffstat:
distrib/notes/sparc/install | 19 +++++++------
distrib/sparc/bootfs.sysinst/Makefile | 12 +++++---
distrib/sparc/list2sh.awk | 8 +++++-
distrib/sparc/ramdisk.sysinst/disktab | 8 +++---
distrib/sparc/ramdisk.sysinst/disktab.preinstall | 31 ------------------------
distrib/sparc/ramdisk.sysinst/dot.profile.m4 | 8 +-----
distrib/sparc/ramdisk.sysinst/list.m4 | 17 +++++-------
distrib/sparc/ramdisk.sysinst/mtree.conf | 7 +----
distrib/sparc/ramdisk.sysinst/ramdiskbin.m4 | 27 ++++++++++----------
distrib/utils/libhack/Makefile.inc | 4 ++-
sys/arch/sparc/conf/INSTALL | 26 +++++++++----------
11 files changed, 66 insertions(+), 101 deletions(-)
diffs (truncated from 446 to 300 lines):
diff -r c0dc1140e6a7 -r 55a885c1fa92 distrib/notes/sparc/install
--- a/distrib/notes/sparc/install Tue Aug 22 15:52:59 2000 +0000
+++ b/distrib/notes/sparc/install Tue Aug 22 16:06:30 2000 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: install,v 1.23 2000/03/13 22:37:14 soren Exp $
+.\" $NetBSD: install,v 1.23.4.1 2000/08/22 16:06:31 abs Exp $
.\"
.\" Copyright (c) 1999 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -163,16 +163,17 @@
files you want
to install into the root directory for your client on the server.
.Pp
-Next, unpack `base.tar.gz' and `etc.tar.gz' on the server in the root
-directory for your machine. If you elect to use a separately NFS-mounted
-filesystem for `/usr' with your diskless setup, make sure the "./usr" base
-files in base.tar.gz end up in the correct location. One way to do this is
-to temporarily use a loopback mount on the server, re-routing
+Next, unpack `base.tar.gz', `etc.tar.gz', and 'kern.tgz' on the server in
+the root directory for your machine. If you elect to use a separately
+NFS-mounted filesystem for `/usr' with your diskless setup, make sure the
+"./usr" base files in base.tar.gz end up in the correct location. One way
+to do this is to temporarily use a loopback mount on the server, re-routing
.Ar root Ns Pa /usr
to your server's exported NetBSD
.Pa /usr
-directory. Also put the kernel and the
-install/upgrade scripts into the root directory.
+directory. Also put 'install.*' and 'upgrade.sh' from the
+.Pa installation/netboot/
+directory into the root directory.
.Pp
A few configuration files need to be edited:
.Bl -tag -width indent
@@ -190,7 +191,7 @@
.Dl server:/export/exec/sun4.netbsd /usr nfs rw 0 0
.El
.Pp
-Now you must populate the `/dev' directory for your client. If yoarserver
+Now you must populate the `/dev' directory for your client. If your server
runs SunOS 4.x, you can simply change your working directory to
.Ar root Ns Pa /dev
and run the MAKEDEV script:
diff -r c0dc1140e6a7 -r 55a885c1fa92 distrib/sparc/bootfs.sysinst/Makefile
--- a/distrib/sparc/bootfs.sysinst/Makefile Tue Aug 22 15:52:59 2000 +0000
+++ b/distrib/sparc/bootfs.sysinst/Makefile Tue Aug 22 16:06:30 2000 +0000
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.4 2000/05/02 16:06:54 sjg Exp $
+# $NetBSD: Makefile,v 1.4.4.1 2000/08/22 16:06:31 abs Exp $
TOP= ${.CURDIR}/..
MINIROOT= ${.CURDIR}/../../miniroot
+KERN= ${KERNOBJDIR}/INSTALL/netbsd
+
.include "${TOP}/Makefile.inc"
+
+.include <bsd.own.mk> # So we use /etc/mk.conf.
.include <bsd.kernobj.mk>
-KERN= ${KERNOBJDIR}/INSTALL/netbsd
-
MOUNT_POINT?= /mnt
VND?= vnd0
VND_DEV= /dev/${VND}a
@@ -35,7 +37,7 @@
CLEANFILES+= netbsd.ram.gz netbsd.tmp
-all: netbsd.ram.gz
+${IMAGE}: netbsd.ram.gz
dd if=/dev/zero of=${IMAGE} bs=1440k count=1
vnconfig -t ${DISKTYPE} -v -c ${VND_CDEV} ${IMAGE}
disklabel -rw ${VND_CDEV} ${DISKTYPE}
@@ -50,7 +52,7 @@
@echo ""
@echo "installing new bootblocks"
-rm -f ${MOUNT_POINT}/boot
- /usr/mdec/binstall -v ffs ${MOUNT_POINT}
+ /usr/mdec/binstall -b boot.400000 -v ffs ${MOUNT_POINT}
umount ${MOUNT_POINT}
vnconfig -u ${VND_CDEV}
diff -r c0dc1140e6a7 -r 55a885c1fa92 distrib/sparc/list2sh.awk
--- a/distrib/sparc/list2sh.awk Tue Aug 22 15:52:59 2000 +0000
+++ b/distrib/sparc/list2sh.awk Tue Aug 22 16:06:30 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: list2sh.awk,v 1.3 1999/04/30 05:09:43 abs Exp $
+# $NetBSD: list2sh.awk,v 1.3.10.1 2000/08/22 16:06:31 abs Exp $
BEGIN {
printf("cd ${CURDIR}\n");
@@ -14,6 +14,12 @@
printf("cp %s ${TARGDIR}/%s\n", $2, $3);
next;
}
+$1 == "COPYSTRIPCOMMENTS" {
+ printf("echo '%s'\n", $0);
+ printf("rm -f ${TARGDIR}/%s\n", $3);
+ printf("sed -e 's/ *#.*//' -e 's/ */ /g' -e '/^$/d' %s > ${TARGDIR}/%s\n", $2, $3);
+ next;
+}
$1 == "LINK" {
printf("echo '%s'\n", $0);
printf("rm -f ${TARGDIR}/%s\n", $3);
diff -r c0dc1140e6a7 -r 55a885c1fa92 distrib/sparc/ramdisk.sysinst/disktab
--- a/distrib/sparc/ramdisk.sysinst/disktab Tue Aug 22 15:52:59 2000 +0000
+++ b/distrib/sparc/ramdisk.sysinst/disktab Tue Aug 22 16:06:30 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: disktab,v 1.1 1999/11/09 15:48:02 mycroft Exp $
+# $NetBSD: disktab,v 1.1.8.1 2000/08/22 16:06:31 abs Exp $
#
# Disk geometry and partition layout tables.
# Key:
@@ -31,6 +31,6 @@
#
floppyinstfs|NetBSD floppy install filesystem:\
- :ty=floppy:se#512:nt#1:rm#300:ns#64:nc#64:\
- :pa#3312:oa#0:ba#4096:fa#512:ta=4.2BSD:\
- :pc#3312:oc#0:
+ :ty=floppy:se#512:nt#1:rm#300:ns#64:nc#56:\
+ :pa#3584:oa#0:ba#4096:fa#512:ta=4.2BSD:\
+ :pc#3584:oc#0:
diff -r c0dc1140e6a7 -r 55a885c1fa92 distrib/sparc/ramdisk.sysinst/disktab.preinstall
--- a/distrib/sparc/ramdisk.sysinst/disktab.preinstall Tue Aug 22 15:52:59 2000 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-# $NetBSD: disktab.preinstall,v 1.1 1999/04/30 05:09:44 abs Exp $
-#
-# Disk geometry and partition layout tables.
-# Key:
-# dt controller type
-# ty type of disk (fixed, removeable, simulated)
-# d[0-4] drive-type-dependent parameters
-# ns #sectors/track
-# nt #tracks/cylinder
-# nc #cylinders/disk
-# sc #sectors/cylinder, nc*nt default
-# su #sectors/unit, sc*nc default
-# se sector size, DEV_BSIZE default
-# rm rpm, 3600 default
-# sf supports bad144-style bad sector forwarding
-# sk sector skew per track, default 0
-# cs sector skew per cylinder, default 0
-# hs headswitch time, default 0
-# ts one-cylinder seek time, default 0
-# il sector interleave (n:1), 1 default
-# bs boot block size, default BBSIZE
-# sb superblock size, default SBSIZE
-# o[a-h] partition offsets in sectors
-# p[a-h] partition sizes in sectors
-# b[a-h] partition block sizes in bytes
-# f[a-h] partition fragment sizes in bytes
-# t[a-h] partition types (filesystem, swap, etc)
-#
-# All partition sizes reserve space for bad sector tables.
-# (5 cylinders needed for maintenance + replacement sectors)
-#
diff -r c0dc1140e6a7 -r 55a885c1fa92 distrib/sparc/ramdisk.sysinst/dot.profile.m4
--- a/distrib/sparc/ramdisk.sysinst/dot.profile.m4 Tue Aug 22 15:52:59 2000 +0000
+++ b/distrib/sparc/ramdisk.sysinst/dot.profile.m4 Tue Aug 22 16:06:30 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dot.profile.m4,v 1.4 2000/06/14 22:52:47 cgd Exp $
+# $NetBSD: dot.profile.m4,v 1.4.2.1 2000/08/22 16:06:32 abs Exp $
#
# Copyright (c) 1997 Perry E. Metzger
# Copyright (c) 1994 Christopher G. Demetriou
@@ -65,15 +65,9 @@
TERM=$ans
fi
- # run update, so that installed software is written as it goes.
- update
-
# mount the ramdisk read write
mount -u $ROOTDEV /
- # mount the kern_fs so that we can examine the dmesg state
- mount -t kernfs /kern /kern
-
# run the installation or upgrade script.
sysinst
fi
diff -r c0dc1140e6a7 -r 55a885c1fa92 distrib/sparc/ramdisk.sysinst/list.m4
--- a/distrib/sparc/ramdisk.sysinst/list.m4 Tue Aug 22 15:52:59 2000 +0000
+++ b/distrib/sparc/ramdisk.sysinst/list.m4 Tue Aug 22 16:06:30 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: list.m4,v 1.5 2000/03/15 12:19:16 soren Exp $
+# $NetBSD: list.m4,v 1.5.4.1 2000/08/22 16:06:32 abs Exp $
# copy the crunched binary, link to it, and kill it
COPY ${OBJDIR}/ramdiskbin ramdiskbin
@@ -24,19 +24,17 @@
LINK ramdiskbin bin/[
LINK ramdiskbin sbin/cd9660
LINK ramdiskbin sbin/disklabel
+LINK ramdiskbin sbin/dmesg
LINK ramdiskbin sbin/ffs
LINK ramdiskbin sbin/fsck
LINK ramdiskbin sbin/fsck_ffs
LINK ramdiskbin sbin/halt
LINK ramdiskbin sbin/ifconfig
LINK ramdiskbin sbin/init
-LINK ramdiskbin sbin/kernfs
LINK ramdiskbin sbin/mknod
LINK ramdiskbin sbin/mount
LINK ramdiskbin sbin/mount_cd9660
-LINK ramdiskbin sbin/mount_ext2fs
LINK ramdiskbin sbin/mount_ffs
-LINK ramdiskbin sbin/mount_kernfs
LINK ramdiskbin sbin/mount_msdos
LINK ramdiskbin sbin/mount_nfs
LINK ramdiskbin sbin/msdos
@@ -53,6 +51,8 @@
LINK ramdiskbin sbin/umount
ifelse(MACHINE,i386, LINK ramdiskbin sbin/fdisk)
ifelse(MACHINE,i386, LINK ramdiskbin sbin/mbrlabel)
+ifelse(MACHINE,i386, LINK ramdiskbin sbin/mount_ext2fs)
+ifelse(MACHINE,sparc, LINK ramdiskbin sbin/sysctl)
SYMLINK /bin/cat usr/bin/chgrp
SYMLINK /bin/cat usr/bin/ftp
SYMLINK /bin/cat usr/bin/gunzip
@@ -68,14 +68,14 @@
SYMLINK /bin/cat usr/sbin/chroot
ifelse(MACHINE,i386, SYMLINK /bin/cat usr/sbin/bad144)
ifelse(MACHINE,sparc, SYMLINK /bin/cat usr/bin/getopt)
-ifelse(MACHINE,sparc, SYMLINK /bin/cat sbin/sysctl)
SPECIAL /bin/rm ramdiskbin
# various files that we need in /etc for the install
COPY SRCROOT/etc/group etc/group
COPY SRCROOT/etc/master.passwd etc/master.passwd
-COPY SRCROOT/etc/protocols etc/protocols
-COPY SRCROOT/etc/services etc/services
+COPYSTRIPCOMMENTS SRCROOT/etc/netconfig etc/netconfig
+COPYSTRIPCOMMENTS SRCROOT/etc/protocols etc/protocols
+COPYSTRIPCOMMENTS SRCROOT/etc/services etc/services
SPECIAL pwd_mkdb -p -d ./ etc/master.passwd
SPECIAL /bin/rm etc/spwd.db
@@ -97,9 +97,6 @@
# and the common installation tools
COPY termcap.mini usr/share/misc/termcap
-# the disktab explanation file
-COPY disktab.preinstall etc/disktab.preinstall
-
#the lists of obsolete files used by sysinst
COPY dist/base_obsolete dist/base_obsolete
COPY dist/comp_obsolete dist/comp_obsolete
diff -r c0dc1140e6a7 -r 55a885c1fa92 distrib/sparc/ramdisk.sysinst/mtree.conf
--- a/distrib/sparc/ramdisk.sysinst/mtree.conf Tue Aug 22 15:52:59 2000 +0000
+++ b/distrib/sparc/ramdisk.sysinst/mtree.conf Tue Aug 22 16:06:30 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mtree.conf,v 1.1 1999/04/30 05:09:44 abs Exp $
+# $NetBSD: mtree.conf,v 1.1.10.1 2000/08/22 16:06:32 abs Exp $
/set type=dir uname=root gname=wheel mode=0755
# .
@@ -34,11 +34,6 @@
# ./mnt2
..
-# ./kern
-kern
-# ./kern
-..
-
# ./sbin
sbin
# ./sbin
diff -r c0dc1140e6a7 -r 55a885c1fa92 distrib/sparc/ramdisk.sysinst/ramdiskbin.m4
--- a/distrib/sparc/ramdisk.sysinst/ramdiskbin.m4 Tue Aug 22 15:52:59 2000 +0000
+++ b/distrib/sparc/ramdisk.sysinst/ramdiskbin.m4 Tue Aug 22 16:06:30 2000 +0000
@@ -1,33 +1,35 @@
-# $NetBSD: ramdiskbin.m4,v 1.3 2000/02/07 11:09:59 pk Exp $
+# $NetBSD: ramdiskbin.m4,v 1.3.4.1 2000/08/22 16:06:32 abs Exp $
#
# ramdiskbin.conf - unified binary for the install ramdisk
#
srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin sys/arch/MACHINE/stand
-progs cat chmod chown chroot cp dd df disklabel ed
-progs fsck fsck_ffs ftp gzip ifconfig init installboot less
-progs ln ls mkdir mknod
-progs mount mount_cd9660 mount_ext2fs mount_ffs mount_msdos
-progs mount_nfs mount_kernfs mt mv newfs ping pwd reboot restore rm
-progs route sed sh shutdown slattach stty swapctl sync test
-progs tip umount
-progs sysinst pax
-ifelse(MACHINE,i386,progs bad144 fdisk mbrlabel)
-ifelse(MACHINE,sparc,progs sysctl getopt)
+progs cat chmod chown chroot cp dd df disklabel dmesg ed
+progs fsck fsck_ffs ftp gzip ifconfig init installboot
+progs less ln ls mkdir mknod mount mount_cd9660
+progs mount_ffs mount_msdos mount_nfs mt mv newfs pax
+progs ping pwd reboot restore rm route sed sh shutdown
+progs slattach swapctl sync sysinst test stty tip umount
Home |
Main Index |
Thread Index |
Old Index