diff options
author | Todd C. Miller <millert@cvs.openbsd.org> | 1998-09-24 06:43:28 +0000 |
---|---|---|
committer | Todd C. Miller <millert@cvs.openbsd.org> | 1998-09-24 06:43:28 +0000 |
commit | 640b3036645f71b02ac49818156f6f974ac5834b (patch) | |
tree | ca4f2e972bb306cc8b8d4182eb649510085bfa61 /distrib/i386 | |
parent | fd3185d1a12826a5ab7b0d307a5bc968b7548062 (diff) |
use cutword, not cut(1), and remove cut(1) from the floppy
Diffstat (limited to 'distrib/i386')
-rw-r--r-- | distrib/i386/floppies/ramdisk/install.md | 6 | ||||
-rw-r--r-- | distrib/i386/floppies/ramdisk/instbin-nokrb.conf | 4 | ||||
-rw-r--r-- | distrib/i386/floppies/ramdisk/instbin.conf | 4 | ||||
-rw-r--r-- | distrib/i386/floppies/ramdisk/list | 3 |
4 files changed, 8 insertions, 9 deletions
diff --git a/distrib/i386/floppies/ramdisk/install.md b/distrib/i386/floppies/ramdisk/install.md index 086eae9bfd7..232fa2602f1 100644 --- a/distrib/i386/floppies/ramdisk/install.md +++ b/distrib/i386/floppies/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.38 1998/09/11 22:55:45 millert Exp $ +# $OpenBSD: install.md,v 1.39 1998/09/24 06:43:26 millert Exp $ # # # Copyright rc) 1996 The NetBSD Foundation, Inc. @@ -62,12 +62,12 @@ md_machine_arch() { md_get_diskdevs() { # return available disk devices - cat /kern/msgbuf | egrep "^[sw]d[0-9]+ " | cut -d" " -f1 | sort -u + cat /kern/msgbuf | egrep "^[sw]d[0-9]+ " | cutword 1 | sort -u } md_get_cddevs() { # return available CDROM devices - cat /kern/msgbuf | egrep "^a?cd[0-9]+ " | cut -d" " -f1 | sort -u + cat /kern/msgbuf | egrep "^a?cd[0-9]+ " | cutword 1 | sort -u } md_get_partition_range() { diff --git a/distrib/i386/floppies/ramdisk/instbin-nokrb.conf b/distrib/i386/floppies/ramdisk/instbin-nokrb.conf index 5ae40bd6566..e85de5f21ac 100644 --- a/distrib/i386/floppies/ramdisk/instbin-nokrb.conf +++ b/distrib/i386/floppies/ramdisk/instbin-nokrb.conf @@ -1,4 +1,4 @@ -# $OpenBSD: instbin-nokrb.conf,v 1.11 1998/08/14 15:30:24 millert Exp $ +# $OpenBSD: instbin-nokrb.conf,v 1.12 1998/09/24 06:43:27 millert Exp $ # # instbin-nokrb.conf - unified binary for the inst/upgr floppies # @@ -12,7 +12,7 @@ progs ifconfig init less ln ls mkdir mknod mount mount_cd9660 progs mount_ffs mount_msdos mount_nfs mount_kernfs mount_ext2fs progs mv newfs pax ksh ping pppd pwd reboot rm route progs scsi sed slattach sleep stty sync test tip umount -progs rsh restore gzip sort grep cut installboot +progs rsh restore gzip sort grep installboot ln chown chgrp ln fsck_ffs fsck diff --git a/distrib/i386/floppies/ramdisk/instbin.conf b/distrib/i386/floppies/ramdisk/instbin.conf index 70baafdb40e..726cde75f2f 100644 --- a/distrib/i386/floppies/ramdisk/instbin.conf +++ b/distrib/i386/floppies/ramdisk/instbin.conf @@ -1,4 +1,4 @@ -# $OpenBSD: instbin.conf,v 1.20 1998/09/15 21:54:43 deraadt Exp $ +# $OpenBSD: instbin.conf,v 1.21 1998/09/24 06:43:27 millert Exp $ # # instbin.conf - unified binary for the inst/upgr floppies # @@ -12,7 +12,7 @@ progs ifconfig init less ln ls mkdir mknod mount mount_cd9660 progs mount_ffs mount_msdos mount_nfs mount_kernfs mount_ext2fs progs mv newfs pax ksh ping pwd reboot rm route progs scsi sed sleep stty sync test tip umount -progs rsh restore gzip sort grep cut installboot +progs rsh restore gzip sort grep installboot ln chown chgrp ln fsck_ffs fsck diff --git a/distrib/i386/floppies/ramdisk/list b/distrib/i386/floppies/ramdisk/list index be70721dd3d..ad1c720efd3 100644 --- a/distrib/i386/floppies/ramdisk/list +++ b/distrib/i386/floppies/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.18 1998/09/17 20:14:14 deraadt Exp $ +# $OpenBSD: list,v 1.19 1998/09/24 06:43:27 millert Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin @@ -43,7 +43,6 @@ LINK instbin sbin/restore LINK instbin sbin/route LINK instbin sbin/scsi LINK instbin sbin/umount -LINK instbin usr/bin/cut LINK instbin usr/bin/egrep usr/bin/fgrep usr/bin/grep LINK instbin usr/bin/ftp LINK instbin usr/bin/gzip usr/bin/gunzip usr/bin/gzcat |