summaryrefslogtreecommitdiff
path: root/distrib/pc532/floppies/inst-common
diff options
context:
space:
mode:
Diffstat (limited to 'distrib/pc532/floppies/inst-common')
-rw-r--r--distrib/pc532/floppies/inst-common/Makefile.inc42
-rw-r--r--distrib/pc532/floppies/inst-common/cloak.c2
-rw-r--r--distrib/pc532/floppies/inst-common/dot.commonutils13
-rw-r--r--distrib/pc532/floppies/inst-common/download.c5
-rw-r--r--distrib/pc532/floppies/inst-common/go.c14
-rw-r--r--distrib/pc532/floppies/inst-common/inject.c2
-rw-r--r--distrib/pc532/floppies/inst-common/instbin.conf33
-rw-r--r--distrib/pc532/floppies/inst-common/list8
-rw-r--r--distrib/pc532/floppies/inst-common/memory_map4
-rw-r--r--distrib/pc532/floppies/inst-common/mtree.conf2
10 files changed, 68 insertions, 57 deletions
diff --git a/distrib/pc532/floppies/inst-common/Makefile.inc b/distrib/pc532/floppies/inst-common/Makefile.inc
index 8d4a508b1ec..02e21b11d47 100644
--- a/distrib/pc532/floppies/inst-common/Makefile.inc
+++ b/distrib/pc532/floppies/inst-common/Makefile.inc
@@ -1,5 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.3 1996/04/25 21:30:33 niklas Exp $
-# $NetBSD: Makefile.inc,v 1.5 1995/11/28 23:58:56 jtc Exp $
+# $NetBSD: Makefile.inc,v 1.5.4.2 1996/08/07 07:29:42 phil Exp $
# TOP is assumed to be defined by Makefile including this one.
@@ -24,7 +23,7 @@ PWDOBJ= ${PWDSRC}/obj
PWDOBJ= ${PWDSRC}
.endif
-all: bsd
+all: netbsd
dd if=/dev/zero of=${IMAGE} bs=18k count=80
disklabel -r -w ${.OBJDIR}/${IMAGE} boot3 2>/dev/null
-yes|bim -c init -c "add ${MDEC}/boot boot" -c "default 0" \
@@ -32,19 +31,25 @@ all: bsd
vnconfig -v -c ${VND_DEV} ${IMAGE}
newfs -b 8192 -f 1024 -O -m 0 -o space -i 204800 -c 80 ${VND_RDEV} boot3
mount ${VND_DEV} ${MOUNT_POINT}
- cp bsd ${MOUNT_POINT}/bsd
+ cp netbsd ${MOUNT_POINT}/netbsd
@df -i ${MOUNT_POINT}
@echo ""
umount ${MOUNT_POINT}
vnconfig -u ${VND_DEV}
-inject.fs: ${CBIN} ${LISTS} bsd.gz
+inject.fs: ${CBIN} ${LISTS} netbsd.gz
(cd ${PWDSRC}; ${MAKE})
- ${CC} -static -o pwd_mkdb ${PWDOBJ}/*.o
+ ${CC} -static -o pwd_mkdb ${PWDOBJ}/*.o -lutil
+.ifndef SD
dd if=/dev/zero of=${.TARGET} bs=128k count=16
vnconfig -v -c ${VND_DEV} ${.TARGET}
newfs -b 8192 -f 1024 -O -m 0 -o space -i 7168 ${VND_RDEV} rd
mount ${VND_DEV} ${MOUNT_POINT}
+.else
+ newfs -b 8192 -f 1024 -O -m 0 -o space -i 7168 -s 4096 \
+ -t 1 -u 256 /dev/r${SD}
+ mount /dev/${SD} ${MOUNT_POINT}
+.endif
mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
@@ -52,7 +57,11 @@ inject.fs: ${CBIN} ${LISTS} bsd.gz
@df -i ${MOUNT_POINT}
@echo ""
umount ${MOUNT_POINT}
+.ifndef SD
vnconfig -u ${VND_DEV}
+.else
+ dd if=/dev/${SD} of=${.TARGET} bs=128k count=16
+.endif
unconfig:
-umount -f ${MOUNT_POINT}
@@ -60,7 +69,6 @@ unconfig:
-/bin/rm -f ${IMAGE}
${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
- (cd ${COMMONDIR}; ${MAKE} download.o)
crunchgen -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${CRUNCHCONF}
${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
@@ -70,29 +78,29 @@ cloak: ${COMMONDIR}/cloak.c
inject: ${COMMONDIR}/inject.c
-bsd.gz:
- gzip -9 <${ADIR}/compile/DEFAULT/bsd >bsd.gz
-# cp ${ADIR}/compile/DEFAULT/bsd /var/tmp/$$$$; \
+netbsd.gz:
+ gzip -9 <${ADIR}/compile/DEFAULT/netbsd >netbsd.gz
+# cp ${ADIR}/compile/DEFAULT/netbsd /var/tmp/$$$$; \
# strip /var/tmp/$$$$; \
-# gzip -9 </var/tmp/$$$$ >bsd.gz; \
+# gzip -9 </var/tmp/$$$$ >netbsd.gz; \
# rm /var/tmp/$$$$
-bsd.o: inject cloak inject.fs
- cp ${ADIR}/compile/INSTALL/bsd /var/tmp/$$$$; \
+netbsd.o: inject cloak inject.fs
+ cp ${ADIR}/compile/INSTALL/netbsd /var/tmp/$$$$; \
strip /var/tmp/$$$$; \
./inject /var/tmp/$$$$ inject.fs; \
- gzip -9 </var/tmp/$$$$ | ./cloak >bsd.o; \
+ gzip -9 </var/tmp/$$$$ | ./cloak >netbsd.o; \
rm /var/tmp/$$$$
go.o: ${COMMONDIR}/go.c
-bsd: bsd.o go.o
- ld -s -z -T 240000 -e _go go.o netbsd.o ${MDEC}/zboot.o -o bsd
+netbsd: netbsd.o go.o
+ ld -s -z -T 240000 -e _go go.o netbsd.o ${MDEC}/zboot.o -o netbsd
clean cleandir:
/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.lo *.c
- /bin/rm -f bsd* inject* cloak pwd_mkdb
+ /bin/rm -f netbsd* inject* cloak pwd_mkdb
.include <bsd.obj.mk>
.include <bsd.subdir.mk>
diff --git a/distrib/pc532/floppies/inst-common/cloak.c b/distrib/pc532/floppies/inst-common/cloak.c
index 54ccd23694c..3a4a8ccdff8 100644
--- a/distrib/pc532/floppies/inst-common/cloak.c
+++ b/distrib/pc532/floppies/inst-common/cloak.c
@@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: cloak.c,v 1.1 1995/10/18 08:37:42 deraadt Exp $
+ * $Id: cloak.c,v 1.2 1996/09/05 21:26:50 deraadt Exp $
*/
#include <stdio.h>
diff --git a/distrib/pc532/floppies/inst-common/dot.commonutils b/distrib/pc532/floppies/inst-common/dot.commonutils
index 95261cc05d2..6ec69a41cd6 100644
--- a/distrib/pc532/floppies/inst-common/dot.commonutils
+++ b/distrib/pc532/floppies/inst-common/dot.commonutils
@@ -1,4 +1,3 @@
-# $OpenBSD: dot.commonutils,v 1.5 1996/06/29 05:54:20 tholo Exp $
#
# Copyright (c) 1994 Christopher G. Demetriou
# All rights reserved.
@@ -27,10 +26,12 @@
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# $Id: dot.commonutils,v 1.6 1996/09/05 21:26:51 deraadt Exp $
-# Installation utilites (functions), to get OpenBSD installed on
+# Installation utilites (functions), to get NetBSD installed on
# the hard disk. These are meant to be invoked from the shell prompt,
-# by people installing OpenBSD.
+# by people installing NetBSD.
# we know that /etc/fstab is only generated on the hard drive
dest_dir=/
@@ -39,7 +40,7 @@ if [ ! -f /etc/fstab ]; then
fi
# counter for possible shared library confusion
-TAR=/bin/tar
+TAR=/usr/bin/tar
GUNZIP=/usr/bin/gunzip
Set_tmp_dir()
@@ -110,7 +111,7 @@ Load_tape()
echo -n "continue..."
read foo
echo "Extracting files from the tape..."
- $TAR -xvpf /dev/$which
+ $TAR --unlink -xvpf /dev/$which
echo "Done."
}
@@ -127,7 +128,7 @@ Extract()
tarverbose=
;;
esac
- cat "$1"* | $GUNZIP | (cd $dest_dir ; $TAR -xp"$tarverbose"f - )
+ cat "$1"* | $GUNZIP | (cd $dest_dir ; $TAR --unlink -xp"$tarverbose"f - )
}
xd()
diff --git a/distrib/pc532/floppies/inst-common/download.c b/distrib/pc532/floppies/inst-common/download.c
index 77ce907136b..35081488753 100644
--- a/distrib/pc532/floppies/inst-common/download.c
+++ b/distrib/pc532/floppies/inst-common/download.c
@@ -1,14 +1,13 @@
-/* $OpenBSD: download.c,v 1.2 1996/04/25 21:30:37 niklas Exp $ */
/* $NetBSD: download.c,v 1.1 1995/10/06 21:00:16 phil Exp $ */
/*
- Hacked by Phil Nelson for use with OpenBSD, 10/5/95.
+ Hacked by Phil Nelson for use with NetBSD, 10/5/95.
This source is in the public domain except for the makeraw function.
The upload part of this program is taken from Bruce's ROM debugger
code.
- For OpenBSD, the usages are:
+ For NetBSD, the usages are:
download file
- open "file" and ship it out standard output with the
diff --git a/distrib/pc532/floppies/inst-common/go.c b/distrib/pc532/floppies/inst-common/go.c
index 43be4735473..c2f0f2bbfb4 100644
--- a/distrib/pc532/floppies/inst-common/go.c
+++ b/distrib/pc532/floppies/inst-common/go.c
@@ -1,5 +1,3 @@
-/* $OpenBSD: go.c,v 1.2 1996/04/25 21:30:41 niklas Exp $ */
-
/*
* Copyright (c) 1995 Matthias Pfaller.
* All rights reserved.
@@ -28,17 +26,19 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $Id: go.c,v 1.3 1996/09/05 21:26:53 deraadt Exp $
*/
#include <sys/reboot.h>
register r6 asm("r6");
/*
- * In order to install OpenBSD on 4mb machines, OpenBSD must survive an
- * overflow of the real kernel into the bsd image. So the compressed kernel
- * image has to be linked in front of the uncompressing code. This code
- * fragment sets the default root disk to rd0 and then jumps behind the
- * compressed kernel image.
+ * In order to install netbsd on 4mb machines, netbsd must survive an overflow
+ * of the real kernel into the netbsd image. So the compressed kernel image
+ * has to be linked in front of the uncompressing code. This code fragment
+ * sets the default root disk to rd0 and then jumps behind the compressed
+ * kernel image.
*/
go()
diff --git a/distrib/pc532/floppies/inst-common/inject.c b/distrib/pc532/floppies/inst-common/inject.c
index d5dd4bcc0f0..60d3eb01183 100644
--- a/distrib/pc532/floppies/inst-common/inject.c
+++ b/distrib/pc532/floppies/inst-common/inject.c
@@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: inject.c,v 1.1 1995/10/18 08:37:42 deraadt Exp $
+ * $Id: inject.c,v 1.2 1996/09/05 21:26:54 deraadt Exp $
*/
#include <stdio.h>
diff --git a/distrib/pc532/floppies/inst-common/instbin.conf b/distrib/pc532/floppies/inst-common/instbin.conf
index b84feb96d3e..3fc34c29390 100644
--- a/distrib/pc532/floppies/inst-common/instbin.conf
+++ b/distrib/pc532/floppies/inst-common/instbin.conf
@@ -1,28 +1,32 @@
#
# kcbin.conf - unified binary for the kc floppy
-# $Id: instbin.conf,v 1.4 1996/06/29 05:54:21 tholo Exp $
+# $Id: instbin.conf,v 1.5 1996/09/05 21:26:55 deraadt Exp $
#
-srcdirs bin sbin usr.bin usr.sbin gnu/usr.bin games
+srcdirs bin sbin usr.bin usr.sbin gnu/usr.bin games distrib/pc532/floppies
-progs basename bc bim cat chat chmod chown chroot cp
-progs date dd df dirname disklabel dmesg domainname download dump
-progs expr factor find fsck ftp
-progs gawk gzip hostname hexdump ifconfig init
-progs kill kvm_mkdb ln ls mkdir mknod more
+progs chat download less pppstats vi
+progs basename bc bim cat chmod chown chroot cp
+progs date dd df dirname disklabel dmesg domainname dump
+progs expr factor find fsck_ffs ftp
+progs gzip hostname hexdump ifconfig init
+progs kill kvm_mkdb ln ls mkdir mknod
progs mount mount_cd9660 mount_ffs mount_msdos mount_nfs mt mv netstat newfs
-progs pax ping pppd pppstats ps pwd rcp reboot restore rm rmdir route
+progs ping pppd ps pwd rcp reboot restore rm rmdir route
progs sed sh slattach strings stty swapon sync sysctl
-progs test tip traceroute umount update vi
+progs tar test tip traceroute umount update
-special chat srcdir /usr/src/usr.sbin/pppd/chat
-special pppstats srcdir /usr/src/usr.sbin/pppd/pppstats
-special vi srcdir /usr/src/usr.bin/vi/common
-special download srcdir /usr/src/distrib/pc532/floppies/inst-common
+special chat srcdir usr.sbin/pppd/chat
+special download srcdir distrib/pc532/floppies/inst-common
+special download objs download.o
+special pppstats srcdir usr.sbin/pppd/pppstats
+special less srcdir usr.bin/less/less
+special vi srcdir usr.bin/vi/build
+ln fsck_ffs fsck
+ln less more
ln chown chgrp
ln dump rdump
-ln gawk awk
ln gzip gzcat gunzip
ln sh -sh # init invokes the shell this way
ln test [
@@ -30,7 +34,6 @@ ln mount_cd9660 cd9660
ln mount_ffs ffs
ln mount_msdos msdos
ln mount_nfs nfs
-ln pax tar
ln restore rrestore
ln vi ex
ln vi view
diff --git a/distrib/pc532/floppies/inst-common/list b/distrib/pc532/floppies/inst-common/list
index ad54d5b3c3b..6e5605e96a4 100644
--- a/distrib/pc532/floppies/inst-common/list
+++ b/distrib/pc532/floppies/inst-common/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.5 1996/06/29 05:54:21 tholo Exp $
+# $Id: list,v 1.6 1996/09/05 21:26:56 deraadt Exp $
# copy the MAKEDEV script and make some devices
COPY ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
@@ -19,7 +19,7 @@ SPECIAL /usr/sbin/chroot . ./pwd_mkdb -p /etc/master.passwd
SPECIAL /bin/rm pwd_mkdb
# copy the crunched binary, link to it
-COPY ${OBJDIR}/bsd.gz bsd.gz
+COPY ${OBJDIR}/netbsd.gz netbsd.gz
COPY ${OBJDIR}/instbin instbin
LINK instbin bin/cat
LINK instbin bin/chmod
@@ -44,7 +44,6 @@ LINK instbin bin/rmdir
LINK instbin bin/sh
LINK instbin bin/stty
LINK instbin bin/sync
-LINK instbin bin/tar
LINK instbin bin/test
LINK instbin bin/[
LINK instbin sbin/bim
@@ -71,7 +70,6 @@ LINK instbin sbin/rrestore
LINK instbin sbin/slattach
LINK instbin sbin/swapon
LINK instbin sbin/umount
-SYMLINK /instbin usr/bin/awk
SYMLINK /instbin usr/bin/basename
SYMLINK /instbin usr/bin/chgrp
SYMLINK /instbin usr/bin/dirname
@@ -83,9 +81,11 @@ SYMLINK /instbin usr/bin/gunzip
SYMLINK /instbin usr/bin/gzcat
SYMLINK /instbin usr/bin/gzip
SYMLINK /instbin usr/bin/more
+SYMLINK /instbin usr/bin/less
SYMLINK /instbin usr/bin/netstat
SYMLINK /instbin usr/bin/sed
SYMLINK /instbin usr/bin/strings
+SYMLINK /instbin usr/bin/tar
SYMLINK /instbin usr/bin/tip
SYMLINK /instbin usr/bin/vi
SYMLINK /instbin usr/bin/view
diff --git a/distrib/pc532/floppies/inst-common/memory_map b/distrib/pc532/floppies/inst-common/memory_map
index a694259dbd3..2017799dfd7 100644
--- a/distrib/pc532/floppies/inst-common/memory_map
+++ b/distrib/pc532/floppies/inst-common/memory_map
@@ -1,5 +1,5 @@
0x400000 Top of physical RAM for 4mb machine
0x3EB800 Start of boot code
0x288000 Start of ramdisk when booting from rd0
-0x240000 Start of bsd image (may overflow into rd0 image)
-0x002000 Start of kernel (may overflow into bsd image)
+0x240000 Start of netbsd image (may overflow into rd0 image)
+0x002000 Start of kernel (may overflow into netbsd image)
diff --git a/distrib/pc532/floppies/inst-common/mtree.conf b/distrib/pc532/floppies/inst-common/mtree.conf
index 4ff0f5df78b..e9f97cf01d4 100644
--- a/distrib/pc532/floppies/inst-common/mtree.conf
+++ b/distrib/pc532/floppies/inst-common/mtree.conf
@@ -1,4 +1,4 @@
-# $Id: mtree.conf,v 1.2 1995/12/14 07:00:37 deraadt Exp $
+# $Id: mtree.conf,v 1.3 1996/09/05 21:26:58 deraadt Exp $
/set type=dir uname=root gname=wheel mode=0755
# .
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 14:04:42 +0000