diff --git a/distrib/x68k/floppies/ramdisk.sysinst/Makefile b/distrib/x68k/floppies/ramdisk.sysinst/Makefile index 99946e36d6f6..6a5ef68aaa43 100644 --- a/distrib/x68k/floppies/ramdisk.sysinst/Makefile +++ b/distrib/x68k/floppies/ramdisk.sysinst/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2000/06/22 14:24:09 minoura Exp $ +# $NetBSD: Makefile,v 1.7 2000/07/05 16:13:28 minoura Exp $ TOP= ${.CURDIR}/.. WARNS=1 @@ -26,7 +26,7 @@ CRUNCHCONF= ${CBIN}.conf MTREE= mtree.conf RAMDISKSPT= 15 -RAMDISKCYLS= 80 +RAMDISKCYLS= 70 RAMDISKSIZE!= expr ${RAMDISKSPT} \* ${RAMDISKCYLS} \* 2 realall: ${IMAGE} diff --git a/distrib/x68k/floppies/ramdisk.sysinst/dot.profile b/distrib/x68k/floppies/ramdisk.sysinst/dot.profile index 3fe78564d0c5..11109ffbc48b 100644 --- a/distrib/x68k/floppies/ramdisk.sysinst/dot.profile +++ b/distrib/x68k/floppies/ramdisk.sysinst/dot.profile @@ -1,4 +1,4 @@ -# $NetBSD: dot.profile,v 1.5 2000/06/14 22:52:49 cgd Exp $ +# $NetBSD: dot.profile,v 1.6 2000/07/05 16:13:30 minoura Exp $ # # Copyright (c) 1997 Perry E. Metzger # Copyright (c) 1994 Christopher G. Demetriou @@ -60,14 +60,9 @@ if [ "X${DONEPROFILE}" = "X" ]; then # 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 - # pull in the functions that people will use from the shell prompt. # . /.commonutils # . /.instutils - dmesg() cat /kern/msgbuf - grep() sed -n "/$1/p" # run sysinst. sysinst diff --git a/distrib/x68k/floppies/ramdisk.sysinst/installboot.sh b/distrib/x68k/floppies/ramdisk.sysinst/installboot.sh index 5643ef0f2ecc..662bcdb4accd 100644 --- a/distrib/x68k/floppies/ramdisk.sysinst/installboot.sh +++ b/distrib/x68k/floppies/ramdisk.sysinst/installboot.sh @@ -6,7 +6,7 @@ # requires /bin/sh /bin/dd (x_dd) /bin/mkdir /bin/rm /bin/test # /sbin/disklabel # -# $NetBSD: installboot.sh,v 1.4 2000/07/04 14:07:43 minoura Exp $ +# $NetBSD: installboot.sh,v 1.5 2000/07/05 16:13:31 minoura Exp $ # # # originally from: @@ -21,92 +21,10 @@ # # NetBSD: installboot.sh,v 1.1 1998/09/01 20:02:34 itohy Exp -usage='echo "usage: $0 [-nvf] /usr/mdec/xxboot /dev/rxx?a" >&2; exit 1' - -blksz=1024 -nblock=8 # boot block in $blksz (8KB) -rawpart=c - PATH=/bin:/sbin:/usr/bin -# parse options -dowrite=true -verbose=false -force=false -while (case "$1" in -*) ;; *) exit 1;; esac); do - case "$1" in - -[nvf]|-[nvf][nvf]|-[nvf][nvf][nvf]|-[nvf][nvf][nvf][nvf]) # enough? - case "$1" in *n*) dowrite=false;; esac - case "$1" in *v*) verbose=true;; esac - case "$1" in *f*) force=true;; esac - shift - ;; - *) - eval $usage;; - esac -done - -case "$#" in -2) ;; -*) eval $usage;; -esac - -boot="$1" -rootdev="$2" -temp=/tmp/installboot$$ - -# report error early -if test ! -f "$boot"; then - echo "$boot: file not found" >&2 - eval $usage -fi - -# check device so as not to destroy non-BSD partitions -if test -b "$rootdev"; then - echo "$rootdev: is a block special---specify a char special" - exit 1 -fi -if test -c "$rootdev"; then - if $force; then :; else # check if not -f - case "$rootdev" in - /dev/rfd??) # floppies---check disklabel later - echo "$rootdev: floppies are not supported!" - exit 1 - ;; - /dev/r*[a-h]) # SCSI disks - $verbose && echo "checking partition type..." - rawdev="`echo \"$rootdev\" | sed 's/.$/'$rawpart'/'`" - part="`echo \"$rootdev\" | sed 's/^.*\(.\)$/\1/'`" - pinfo="`disklabel \"$rawdev\" | sed '1,/^$/d' | - sed -n -e 's/^#.*/#/p' -e \"/^ $part/p\"`" - $verbose && echo "$pinfo" | sed '/^#/d' - case "$pinfo" in - '#'*' '$part:*4.2BSD*) - $verbose && echo "partition OK" - ;; - '#') echo "$rootdev: no such partition" >&2 - exit 1;; - '') echo "$rootdev: can't read disklabel" >&2 - exit 1;; - *) echo "$rootdev: not a BSD filesystem" >&2 - exit 1;; - esac - ;; - /*) # ??? - echo "$rootdev: can't install boot to this device" >&2 - exit 1;; - *) - echo "$rootdev: not in the absolute path" >&2 - exit 1;; - esac - fi -elif test ! -f "$rootdev"; then - echo "$rootdev: no such file or character special" >&2 - exit 1 -fi - -# write boot block -$verbose && echo "writing $boot to $rootdev" -cmd="cat $boot /dev/null dd bs=$blksz count=$nblock of=$rootdev" -$verbose && echo "$cmd" -if $dowrite; then $cmd; else :; fi +echo "$0: THIS VERSION OF $0 DOES NO ERROR CHECK!" +echo "$0: Sleeping for 5 seconds; press ^C to abort." +echo "===> cat $1 /dev/zero | dd ibs=1 count=8192 obs=512 of=$2" +sleep 5 +cat $1 /dev/zero | dd ibs=1 count=8192 obs=512 of=$2 diff --git a/distrib/x68k/floppies/ramdisk.sysinst/list b/distrib/x68k/floppies/ramdisk.sysinst/list index 626b6dca2453..b68ece697e5d 100644 --- a/distrib/x68k/floppies/ramdisk.sysinst/list +++ b/distrib/x68k/floppies/ramdisk.sysinst/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.6 2000/06/22 14:24:10 minoura Exp $ +# $NetBSD: list,v 1.7 2000/07/05 16:13:31 minoura Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/ramdiskbin ramdiskbin @@ -16,9 +16,9 @@ LINK ramdiskbin bin/mt LINK ramdiskbin bin/mv LINK ramdiskbin bin/pax LINK ramdiskbin bin/pwd -LINK ramdiskbin bin/rcmd LINK ramdiskbin bin/rm LINK ramdiskbin bin/sh +LINK ramdiskbin bin/sleep LINK ramdiskbin bin/stty LINK ramdiskbin bin/sync LINK ramdiskbin bin/test @@ -45,9 +45,7 @@ LINK ramdiskbin sbin/nfs LINK ramdiskbin sbin/ping LINK ramdiskbin sbin/ping6 LINK ramdiskbin sbin/reboot -LINK ramdiskbin sbin/restore LINK ramdiskbin sbin/route -LINK ramdiskbin sbin/rrestore LINK ramdiskbin sbin/rtsol LINK ramdiskbin sbin/shutdown LINK ramdiskbin sbin/slattach @@ -60,9 +58,7 @@ SYMLINK /bin/cat usr/bin/gzcat SYMLINK /bin/cat usr/bin/gzip SYMLINK /bin/cat usr/bin/less SYMLINK /bin/cat usr/bin/more -SYMLINK /bin/cat usr/bin/sed SYMLINK /bin/cat usr/bin/tar -SYMLINK /bin/cat usr/bin/tip SYMLINK /bin/cat usr/mdec/newdisk SYMLINK /bin/cat usr/sbin/chown SYMLINK /bin/cat usr/sbin/chroot diff --git a/distrib/x68k/floppies/ramdisk.sysinst/ramdiskbin.conf b/distrib/x68k/floppies/ramdisk.sysinst/ramdiskbin.conf index 35683523b7a3..a04d29f547ec 100644 --- a/distrib/x68k/floppies/ramdisk.sysinst/ramdiskbin.conf +++ b/distrib/x68k/floppies/ramdisk.sysinst/ramdiskbin.conf @@ -1,4 +1,4 @@ -# $NetBSD: ramdiskbin.conf,v 1.4 2000/06/22 14:24:10 minoura Exp $ +# $NetBSD: ramdiskbin.conf,v 1.5 2000/07/05 16:13:31 minoura Exp $ # # ramdiskbin.conf - unified binary for the install ramdisk # @@ -8,9 +8,9 @@ srcdirs bin sbin usr.bin usr.sbin gnu/usr.bin sys/arch/x68k/stand progs cat chmod chown chroot cp dd df disklabel ed progs fsck fsck_ffs ftp gzip ifconfig init more progs ln ls memswitch mkdir mknod mount mount_cd9660 mount_ffs mount_msdos -progs mount_nfs mount_kernfs mt mv newfs ping pwd rcmd reboot restore rm -progs route sed sh shutdown slattach stty swapctl sync pax test -progs tip umount ping6 rtsol +progs mount_nfs mount_kernfs mt mv newfs ping pwd reboot rm +progs route sh shutdown slattach sleep stty swapctl sync pax test +progs umount ping6 rtsol progs sysinst progs newdisk @@ -39,7 +39,6 @@ ln mount_msdos msdos ln mount_nfs nfs ln mount_kernfs kernfs ln reboot halt -ln restore rrestore # libhack.o is built by Makefile & included Makefile.inc libs libhack.o -lz -ledit -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm