diff options
-rw-r--r-- | distrib/hp300/ramdisk/install.md | 14 | ||||
-rw-r--r-- | distrib/hp300/ramdisk/list | 4 | ||||
-rw-r--r-- | distrib/hp300/ramdisk/raminst.conf | 4 |
3 files changed, 10 insertions, 12 deletions
diff --git a/distrib/hp300/ramdisk/install.md b/distrib/hp300/ramdisk/install.md index bae873e2b9c..8847e7f0191 100644 --- a/distrib/hp300/ramdisk/install.md +++ b/distrib/hp300/ramdisk/install.md @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: install.md,v 1.16 1999/04/01 04:15:33 millert Exp $ +# $OpenBSD: install.md,v 1.17 1999/04/01 04:39:50 millert Exp $ # $NetBSD: install.md,v 1.1.2.4 1996/08/26 15:45:14 gwr Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -54,8 +54,8 @@ md_set_term() { TERM="$resp" export TERM # set screensize (i.e., for an xterm) - rows=`stty -a | grep rows | awk '{print $4}'` - columns=`stty -a | grep columns | awk '{print $6}'` + rows=`stty -a | grep rows | cutword 4` + columns=`stty -a | grep columns | cutword 6` if [ "$rows" -eq 0 -o "$columns" -eq 0 ]; then echo -n "Specify terminal rows [25]: " getresp "25" @@ -113,13 +113,13 @@ md_machine_arch() { md_get_diskdevs() { # return available disk devices - egrep "^hd[0-9]*:." < /kern/msgbuf | cut -d":" -f1 | sort -u - egrep "^sd[0-9]*:.*cylinders" < /kern/msgbuf | cut -d":" -f1 | sort -u + egrep "^hd[0-9]*:." < /kern/msgbuf | cutword -t: 1 | sort -u + egrep "^sd[0-9]*:.*cylinders" < /kern/msgbuf | cutword -t: 1 | sort -u } md_get_cddevs() { # return available CD-ROM devices - egrep "sd[0-9]*:.*CD-ROM" < /kern/msgbuf | cut -d":" -f1 | sort -u + egrep "sd[0-9]*:.*CD-ROM" < /kern/msgbuf | cutword -t: 1 | sort -u } md_get_partition_range() { @@ -311,7 +311,7 @@ hp300_init_label_hpib_disk() { _hpib_disktype="" if egrep "${1}: " < /kern/msgbuf > /dev/null 2>&1; then _hpib_disktype=HP`egrep "${1}: " < /kern/msgbuf | sort -u | \ - awk '{print $2}'` + cutword 2 ` fi if [ "X${_hpib_disktype}" = "X" ]; then echo "" diff --git a/distrib/hp300/ramdisk/list b/distrib/hp300/ramdisk/list index 8c154cc790f..f4cfa0e5372 100644 --- a/distrib/hp300/ramdisk/list +++ b/distrib/hp300/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.12 1999/04/01 03:35:57 millert Exp $ +# $OpenBSD: list,v 1.13 1999/04/01 04:39:51 millert Exp $ COPY ${OBJDIR}/raminst raminst LINK raminst bin/cat @@ -41,9 +41,7 @@ LINK raminst sbin/reboot LINK raminst sbin/route LINK raminst sbin/slattach LINK raminst sbin/umount -LINK raminst usr/bin/awk LINK raminst usr/bin/chgrp -LINK raminst usr/bin/cut LINK raminst usr/bin/ftp LINK raminst usr/bin/egrep LINK raminst usr/bin/grep diff --git a/distrib/hp300/ramdisk/raminst.conf b/distrib/hp300/ramdisk/raminst.conf index 4451f7c5cb2..aeaafcbba26 100644 --- a/distrib/hp300/ramdisk/raminst.conf +++ b/distrib/hp300/ramdisk/raminst.conf @@ -1,5 +1,5 @@ # -# $OpenBSD: raminst.conf,v 1.7 1998/08/14 15:30:21 millert Exp $ +# $OpenBSD: raminst.conf,v 1.8 1999/04/01 04:39:51 millert Exp $ # # raminst.conf - unified binary for the RAM disk # @@ -7,7 +7,7 @@ srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin usr.sbin/pppd srcdirs usr.bin/vi -progs awk cat chat chmod chown chroot cp cut dd df disklabel ed expr fsck_ffs +progs cat chat chmod chown chroot cp dd df disklabel ed expr fsck_ffs progs ftp grep gzip hostname ifconfig init kill less ln ls mkdir mknod mount progs mount_cd9660 mount_ffs mount_kernfs mount_nfs progs mv newfs pax ksh ping pppd pwd reboot rm route build |