From 81048a555a18a95e7141c470c0a12a3258ae8cf7 Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Sat, 27 May 1995 20:49:59 +0000 Subject: [PATCH] 1. Remove slattach from the root_crunch floppy and stick it on the boot floppy (for slip install). 2. Try to work around a bodge in the ftp extraction loop where FtpEOF() was being called more than once. Also fix a problem where the URL was getting smashed in the environment by copying it to a temporary area before we jump up and down on it. --- release/alpha/boot_crunch.conf | 4 ++-- release/amd64/boot_crunch.conf | 4 ++-- release/boot_crunch.conf | 4 ++-- release/i386/boot_crunch.conf | 4 ++-- release/pc98/boot_crunch.conf | 4 ++-- release/root_crunch.conf | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/release/alpha/boot_crunch.conf b/release/alpha/boot_crunch.conf index 2792d28883b3..4ef0d39f7394 100644 --- a/release/alpha/boot_crunch.conf +++ b/release/alpha/boot_crunch.conf @@ -1,11 +1,11 @@ -# $Id: boot_crunch.conf,v 1.15 1995/05/26 21:15:47 jkh Exp $ +# $Id: boot_crunch.conf,v 1.16 1995/05/27 11:18:52 jkh Exp $ srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin /usr/src/sbin/i386 progs ls cat df sh pwd find progs mount mount_cd9660 mount_msdos mount_nfs ping ppp umount -progs sysinstall newfs gzip cpio bad144 fsck ifconfig route +progs sysinstall newfs gzip cpio bad144 fsck ifconfig route slattach ln gzip gunzip ln gzip zcat ln sh -sh diff --git a/release/amd64/boot_crunch.conf b/release/amd64/boot_crunch.conf index 2792d28883b3..4ef0d39f7394 100644 --- a/release/amd64/boot_crunch.conf +++ b/release/amd64/boot_crunch.conf @@ -1,11 +1,11 @@ -# $Id: boot_crunch.conf,v 1.15 1995/05/26 21:15:47 jkh Exp $ +# $Id: boot_crunch.conf,v 1.16 1995/05/27 11:18:52 jkh Exp $ srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin /usr/src/sbin/i386 progs ls cat df sh pwd find progs mount mount_cd9660 mount_msdos mount_nfs ping ppp umount -progs sysinstall newfs gzip cpio bad144 fsck ifconfig route +progs sysinstall newfs gzip cpio bad144 fsck ifconfig route slattach ln gzip gunzip ln gzip zcat ln sh -sh diff --git a/release/boot_crunch.conf b/release/boot_crunch.conf index 2792d28883b3..4ef0d39f7394 100644 --- a/release/boot_crunch.conf +++ b/release/boot_crunch.conf @@ -1,11 +1,11 @@ -# $Id: boot_crunch.conf,v 1.15 1995/05/26 21:15:47 jkh Exp $ +# $Id: boot_crunch.conf,v 1.16 1995/05/27 11:18:52 jkh Exp $ srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin /usr/src/sbin/i386 progs ls cat df sh pwd find progs mount mount_cd9660 mount_msdos mount_nfs ping ppp umount -progs sysinstall newfs gzip cpio bad144 fsck ifconfig route +progs sysinstall newfs gzip cpio bad144 fsck ifconfig route slattach ln gzip gunzip ln gzip zcat ln sh -sh diff --git a/release/i386/boot_crunch.conf b/release/i386/boot_crunch.conf index 2792d28883b3..4ef0d39f7394 100644 --- a/release/i386/boot_crunch.conf +++ b/release/i386/boot_crunch.conf @@ -1,11 +1,11 @@ -# $Id: boot_crunch.conf,v 1.15 1995/05/26 21:15:47 jkh Exp $ +# $Id: boot_crunch.conf,v 1.16 1995/05/27 11:18:52 jkh Exp $ srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin /usr/src/sbin/i386 progs ls cat df sh pwd find progs mount mount_cd9660 mount_msdos mount_nfs ping ppp umount -progs sysinstall newfs gzip cpio bad144 fsck ifconfig route +progs sysinstall newfs gzip cpio bad144 fsck ifconfig route slattach ln gzip gunzip ln gzip zcat ln sh -sh diff --git a/release/pc98/boot_crunch.conf b/release/pc98/boot_crunch.conf index 2792d28883b3..4ef0d39f7394 100644 --- a/release/pc98/boot_crunch.conf +++ b/release/pc98/boot_crunch.conf @@ -1,11 +1,11 @@ -# $Id: boot_crunch.conf,v 1.15 1995/05/26 21:15:47 jkh Exp $ +# $Id: boot_crunch.conf,v 1.16 1995/05/27 11:18:52 jkh Exp $ srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin /usr/src/sbin/i386 progs ls cat df sh pwd find progs mount mount_cd9660 mount_msdos mount_nfs ping ppp umount -progs sysinstall newfs gzip cpio bad144 fsck ifconfig route +progs sysinstall newfs gzip cpio bad144 fsck ifconfig route slattach ln gzip gunzip ln gzip zcat ln sh -sh diff --git a/release/root_crunch.conf b/release/root_crunch.conf index df4aa1188a49..f1d8d8b4c96d 100644 --- a/release/root_crunch.conf +++ b/release/root_crunch.conf @@ -1,4 +1,4 @@ -# $Id: root_crunch.conf,v 1.1 1995/05/25 18:43:41 jkh Exp $ +# $Id: root_crunch.conf,v 1.2 1995/05/26 21:15:50 jkh Exp $ # first, we list the source dirs that our programs reside in. These are # searched in order listed to find the dir containing each program. @@ -13,8 +13,8 @@ srcdirs /usr/src/usr.sbin # /bin stuff -progs cat chmod cksum cp date dd df echo ed expr grep hostname kill ln -progs mkdir mt mv pwd rcp rm rmdir sleep slattach stty sync test ft +progs chmod cksum cp date dd echo ed expr grep hostname kill ln +progs mkdir mt mv pwd rcp rm rmdir sleep stty sync test ft ln test [ # /sbin stuff