/netbsd -> /bsd, more -> less, FLOPPY3 environment variable makes 1.44 Meg

image instead of 1.2 Meg (currently required because things are too big).

diff --git a/distrib/i386/floppies/inst-common/Makefile.inc b/distrib/i386/floppies/inst-common/Makefile.inc
index 202e346..2254038 100644 (file)
--- a/distrib/i386/floppies/inst-common/Makefile.inc
+++ b/distrib/i386/floppies/inst-common/Makefile.inc
@@ -1,4 +1,4 @@
-#      $Id: Makefile.inc,v 1.1.1.1 1995/10/18 08:37:33 deraadt Exp $
+#      $Id: Makefile.inc,v 1.2 1996/02/02 07:24:30 dm Exp $
 
 # TOP is assumed to be defined by Makefile including this one.
 
@@ -17,9 +17,15 @@ CRUNCHCONF=  ${COMMONDIR}/${CBIN}.conf
 MTREE=         ${COMMONDIR}/mtree.conf
 
 all: ${CBIN}
-       dd if=/dev/zero of=${IMAGE} bs=100k count=12
+.ifndef FLOPPY3
+       dd if=/dev/zero of=${IMAGE} bs=10k count=120
        vnconfig -v -c ${VND_DEV} ${IMAGE}
        newfs -O -m 0 -o space -i 5120 -c 80 ${VND_RDEV} floppy5
+.else
+       dd if=/dev/zero of=${IMAGE} bs=10k count=144
+       vnconfig -v -c ${VND_DEV} ${IMAGE}
+       newfs -O -m 0 -o space -i 5120 -c 80 ${VND_RDEV} floppy3
+.endif
        mount ${VND_DEV} ${MOUNT_POINT}
        mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
        TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \

diff --git a/distrib/i386/floppies/inst-common/instbin.conf b/distrib/i386/floppies/inst-common/instbin.conf
index 18d14ca..cea5689 100644 (file)
--- a/distrib/i386/floppies/inst-common/instbin.conf
+++ b/distrib/i386/floppies/inst-common/instbin.conf
@@ -1,12 +1,12 @@
 #
 # kcbin.conf - unified binary for the kc floppy
-# $Id: instbin.conf,v 1.3 1995/12/14 07:00:12 deraadt Exp $    
+# $Id: instbin.conf,v 1.4 1996/02/02 07:24:31 dm Exp $ 
 #
 
-srcdirs bin sbin usr.bin usr.sbin gnu/usr.bin
+srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
 
 progs bad144 cat chmod chown chroot cp dd df disklabel ed expr fsck ftp gawk
-progs gzip ifconfig init ln ls mkdir mknod more mount mount_cd9660
+progs gzip ifconfig init less ln ls mkdir mknod mount mount_cd9660
 progs mount_ffs mount_msdos mount_nfs mount_kernfs
 progs mv newfs ping pwd reboot rm route
 progs sed sh shutdown slattach strings stty sync tar test tip umount
@@ -24,4 +24,4 @@ ln mount_nfs nfs
 ln mount_kernfs kernfs
 ln reboot halt
 
-libs -ledit -lutil -ltermcap -lcrypt -ll -lm
+libs -ledit -lutil -ltermcap -lcrypt -lkrb -ldes -ll -lm

diff --git a/distrib/i386/floppies/inst-common/list b/distrib/i386/floppies/inst-common/list
index 87c3da4..8d8ca20 100644 (file)
--- a/distrib/i386/floppies/inst-common/list
+++ b/distrib/i386/floppies/inst-common/list
@@ -1,4 +1,4 @@
-#      $Id: list,v 1.3 1995/12/14 07:00:13 deraadt Exp $
+#      $Id: list,v 1.4 1996/02/02 07:24:32 dm Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY   ${OBJDIR}/instbin       instbin
@@ -45,7 +45,7 @@ SYMLINK       /bin/cat                usr/bin/ftp
 SYMLINK        /bin/cat                usr/bin/gunzip
 SYMLINK        /bin/cat                usr/bin/gzcat
 SYMLINK        /bin/cat                usr/bin/gzip
-SYMLINK        /bin/cat                usr/bin/more
+SYMLINK        /bin/cat                usr/bin/less
 SYMLINK        /bin/cat                usr/bin/sed
 SYMLINK        /bin/cat                usr/bin/strings
 SYMLINK        /bin/cat                usr/bin/tar

diff --git a/distrib/i386/floppies/inst/install.sh b/distrib/i386/floppies/inst/install.sh
index 2f2a30b..ba4baa4 100644 (file)
--- a/distrib/i386/floppies/inst/install.sh
+++ b/distrib/i386/floppies/inst/install.sh
@@ -28,7 +28,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: install.sh,v 1.4 1995/12/14 07:00:10 deraadt Exp $
+#      $Id: install.sh,v 1.5 1996/02/02 07:24:28 dm Exp $
 
 #      NetBSD installation script.
 #      In a perfect world, this would be a nice C program, with a reasonable
@@ -168,7 +168,7 @@ echo -n "View the boot messages again? [n] "
 getresp "n"
 case "$resp" in
        y*|Y*)
-               more /kern/msgbuf
+               less /kern/msgbuf
                ;;
        *)
                echo    ""

diff --git a/distrib/i386/floppies/kc-common/Makefile.inc b/distrib/i386/floppies/kc-common/Makefile.inc
index b9ca7e7..18fd4f7 100644 (file)
--- a/distrib/i386/floppies/kc-common/Makefile.inc
+++ b/distrib/i386/floppies/kc-common/Makefile.inc
@@ -1,4 +1,4 @@
-#      $Id: Makefile.inc,v 1.1.1.1 1995/10/18 08:37:34 deraadt Exp $
+#      $Id: Makefile.inc,v 1.2 1996/02/02 07:24:33 dm Exp $
 
 # TOP is assumed to be defined by Makefile including this one.
 
@@ -17,10 +17,20 @@ CRUNCHCONF= ${COMMONDIR}/${CBIN}.conf
 MTREE=         ${COMMONDIR}/mtree.conf
 
 all: ${CBIN}
-       dd if=/dev/zero of=${IMAGE} bs=100k count=12
+.ifndef FLOPPY3
+.else
+.endif
+.ifndef FLOPPY3
+       dd if=/dev/zero of=${IMAGE} bs=10k count=120
        vnconfig -v -c ${VND_DEV} ${IMAGE}
        disklabel -w -B -b ${MDEC}/fdboot -s ${MDEC}/bootfd ${VND} floppy5
-       newfs -O -m 0 -o space -i 6144 -c 80 ${VND_RDEV} floppy5
+       newfs -O -m 0 -o space -i 5120 -c 80 ${VND_RDEV} floppy5
+.else
+       dd if=/dev/zero of=${IMAGE} bs=10k count=144
+       vnconfig -v -c ${VND_DEV} ${IMAGE}
+       disklabel -w -B -b ${MDEC}/fdboot -s ${MDEC}/bootfd ${VND} floppy3
+       newfs -O -m 0 -o space -i 5120 -c 80 ${VND_RDEV} floppy3
+.endif
        mount ${VND_DEV} ${MOUNT_POINT}
        mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
        TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \

diff --git a/distrib/i386/floppies/kc-common/copy_kernel.sh b/distrib/i386/floppies/kc-common/copy_kernel.sh
index 11393d1..e15c663 100644 (file)
--- a/distrib/i386/floppies/kc-common/copy_kernel.sh
+++ b/distrib/i386/floppies/kc-common/copy_kernel.sh
@@ -1,10 +1,10 @@
-#      $Id: copy_kernel.sh,v 1.1.1.1 1995/10/18 08:37:35 deraadt Exp $
+#      $Id: copy_kernel.sh,v 1.2 1996/02/02 07:24:33 dm Exp $
 #
 #      Kernel copy script
 
 DEFAULT_PARTITON=sd0a
 MOUNT_POINT=/mnt
-KERNEL_NAME=/netbsd
+KERNEL_NAME=/bsd
 #TEST=testfn
 
 testfn() {

diff --git a/distrib/i386/floppies/kcadp/list b/distrib/i386/floppies/kcadp/list
index f9cddc8..6274cab 100644 (file)
--- a/distrib/i386/floppies/kcadp/list
+++ b/distrib/i386/floppies/kcadp/list
@@ -1,4 +1,4 @@
-#      $Id: list,v 1.1 1996/01/12 03:13:44 deraadt Exp $
+#      $Id: list,v 1.2 1996/02/02 07:24:34 dm Exp $
 
 # copy the kernel
-COPY   ${CURDIR}/../../../../sys/arch/i386/compile/INSTADP/netbsd      netbsd
+COPY   ${CURDIR}/../../../../sys/arch/i386/compile/INSTADP/bsd bsd

diff --git a/distrib/i386/floppies/kcoth/list b/distrib/i386/floppies/kcoth/list
index fd44af1..3460712 100644 (file)
--- a/distrib/i386/floppies/kcoth/list
+++ b/distrib/i386/floppies/kcoth/list
@@ -1,4 +1,4 @@
-#      $Id: list,v 1.1 1996/01/12 03:13:45 deraadt Exp $
+#      $Id: list,v 1.2 1996/02/02 07:24:35 dm Exp $
 
 # copy the kernel
-COPY   ${CURDIR}/../../../../sys/arch/i386/compile/INSTOTHER/netbsd    netbsd
+COPY   ${CURDIR}/../../../../sys/arch/i386/compile/INSTOTHER/bsd       bsd