>Number:         11637
>Category:       port-i386
>Synopsis:       use distrib/utils/more on i386 floppies
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    port-i386-maintainer
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Dec 05 09:10:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     Alan Barrett
>Release:        NetBSD-current 2000-12-04
>Organization:
not much
>Environment:
	NetBSD/i386 1.5L
>Description:
	Several of the floppy images in src/distrib/i386/floppies
are too large.

ramdisk-big is OK
ramdisk-small is OK (but only because "less" was removed
	in revision 1.2 of ramdisk-small/ramdiskbin.conf)
ramdisk-tiny is too large.
ramdisk-rescuesmall is too large
ramdisk-rescuetiny is too large

>How-To-Repeat:
	cd ${BSDSRCDIR}/distrib/i386/floppies
	make
>Fix:
Instead of using the full version "less",
use the small version of "more" from distrib/utils/more.

The appended patch leaves ramdisk-big unchanged (with the full version
of less), adds the small version of more to ramdisk-small (which
currently has neither less nor more), and changes ramdisk-tiny,
ramdisk-rescuesmall and ramdisk-rescuetiny to use the small version of
more (instead of the full version of less).

Index: ramdisk-rescuesmall/ramdiskbin.conf
--- ramdisk-rescuesmall/ramdiskbin.conf	2000/09/27 16:04:15	1.1
+++ ramdisk-rescuesmall/ramdiskbin.conf	2000/12/05 16:31:11
@@ -3,11 +3,11 @@
 # ramdiskbin.conf - unified binary for the install ramdisk
 #
 
-srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin sys/arch/i386/stand
+srcdirs bin sbin usr.bin usr.sbin gnu/usr.bin sys/arch/i386/stand
 
 progs bad144 cat chmod chown chroot cp dd df disklabel dump ed
-progs fsck fsck_ffs ftp gzip ifconfig init installboot less
-progs ln ls mkdir mknod
+progs fsck fsck_ffs ftp gzip ifconfig init installboot
+progs ln ls mkdir mknod more
 progs mount mount_cd9660 mount_ffs mount_msdos
 progs mount_nfs mt mv newfs ping pwd rcmd reboot restore rm
 progs route sh stty swapctl sync
@@ -20,6 +20,7 @@
 special dd srcdir distrib/utils/x_dd
 special ftp srcdir distrib/utils/x_ftp
 special ifconfig srcdir distrib/utils/x_ifconfig
+special more srcdir distrib/utils/more
 special route srcdir distrib/utils/x_route
 special sh srcdir distrib/utils/x_sh
 special ping srcdir distrib/utils/x_ping
@@ -27,7 +28,7 @@
 ln pax tar
 ln chown chgrp
 ln gzip gzcat gunzip
-ln less more
+ln more less
 ln sh -sh		# init invokes the shell this way
 ln reboot halt
 ln dump rdump
Index: ramdisk-rescuetiny/ramdiskbin.conf
--- ramdisk-rescuetiny/ramdiskbin.conf	2000/09/27 16:04:16	1.1
+++ ramdisk-rescuetiny/ramdiskbin.conf	2000/12/05 16:40:05
@@ -3,11 +3,11 @@
 # ramdiskbin.conf - unified binary for the install ramdisk
 #
 
-srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin sys/arch/i386/stand
+srcdirs bin sbin usr.bin usr.sbin gnu/usr.bin sys/arch/i386/stand
 
 progs bad144 cat chio chmod chown chroot cp dd df disklabel dump ed
-progs fsck fsck_ffs ftp gzip ifconfig init installboot less
-progs ln ls mkdir mknod
+progs fsck fsck_ffs ftp gzip ifconfig init installboot
+progs ln ls mkdir mknod more
 progs mount mount_cd9660 mount_ext2fs mount_ffs mount_msdos
 progs mount_nfs mount_kernfs mt mv newfs ping pwd rcmd reboot restore rm
 progs route scsictl sh sysctl stty swapctl sync
@@ -20,6 +20,7 @@
 special dd srcdir distrib/utils/x_dd
 special ftp srcdir distrib/utils/x_ftp
 special ifconfig srcdir distrib/utils/x_ifconfig
+special more srcdir distrib/utils/more
 special route srcdir distrib/utils/x_route
 special sh srcdir distrib/utils/x_sh
 special ping srcdir distrib/utils/x_ping
@@ -27,7 +28,7 @@
 ln pax tar
 ln chown chgrp
 ln gzip gzcat gunzip
-ln less more
+ln more less
 ln sh -sh		# init invokes the shell this way
 ln reboot halt
 ln dump rdump
Index: ramdisk-small/ramdiskbin.conf
--- ramdisk-small/ramdiskbin.conf	2000/10/06 14:40:37	1.2
+++ ramdisk-small/ramdiskbin.conf	2000/12/05 16:45:09
@@ -7,7 +7,7 @@
 
 progs bad144 cat chmod chown cp disklabel
 progs fsck fsck_ffs ftp gzip ifconfig init installboot
-progs ln ls mkdir mknod
+progs ln ls mkdir mknod more
 progs mount mount_cd9660 mount_ffs mount_msdos
 progs mount_nfs mount_kernfs mv newfs ping pwd reboot rm
 progs route sed sh stty swapctl
@@ -20,6 +20,7 @@
 
 special ftp srcdir distrib/utils/x_ftp
 special ifconfig srcdir distrib/utils/x_ifconfig
+special more srcdir distrib/utils/more
 special route srcdir distrib/utils/x_route
 special sh srcdir distrib/utils/x_sh
 special ping srcdir distrib/utils/x_ping
@@ -32,6 +33,7 @@
 ln pax tar
 ln chown chgrp
 ln gzip gzcat gunzip
+ln more less
 ln sh -sh		# init invokes the shell this way
 ln reboot halt
 
Index: ramdisk-tiny/ramdiskbin.conf
--- ramdisk-tiny/ramdiskbin.conf	2000/09/27 16:04:17	1.2
+++ ramdisk-tiny/ramdiskbin.conf	2000/12/05 16:25:58
@@ -3,11 +3,11 @@
 # ramdiskbin.conf - unified binary for the install ramdisk
 #
 
-srcdirs bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin sys/arch/i386/stand
+srcdirs bin sbin usr.bin usr.sbin gnu/usr.bin sys/arch/i386/stand
 
 progs bad144 cat chmod chown chroot cp disklabel
-progs fsck fsck_ffs ftp gzip ifconfig init installboot less
-progs ln ls mkdir mknod
+progs fsck fsck_ffs ftp gzip ifconfig init installboot
+progs ln ls mkdir mknod more
 progs mount mount_cd9660 mount_ffs mount_msdos
 progs mount_nfs mount_kernfs mv newfs ping pwd reboot rm
 progs route sed sh stty swapctl
@@ -18,6 +18,7 @@
 special sysinst srcdir distrib/utils/sysinst/arch/i386
 special ftp srcdir distrib/utils/x_ftp
 special ifconfig srcdir distrib/utils/x_ifconfig
+special more srcdir distrib/utils/more
 special route srcdir distrib/utils/x_route
 special sh srcdir distrib/utils/x_sh
 special ping srcdir distrib/utils/x_ping
@@ -28,7 +29,7 @@
 ln pax tar
 ln chown chgrp
 ln gzip gzcat gunzip
-ln less more
+ln more less
 ln sh -sh		# init invokes the shell this way
 ln reboot halt
 
>Release-Note:
>Audit-Trail:
>Unformatted: