extract() is more friendly

added load_dos (just calls load_fd)

5 files changed, 28 insertions, 16 deletions

diff --git a/etc/etc.i386/cpio.magic b/etc/etc.i386/cpio.magic
index 48070e6..d271cd8 100644
--- a/etc/etc.i386/cpio.magic
+++ b/etc/etc.i386/cpio.magic
@@ -1,11 +1,11 @@
 #!bin/sh
-#	$Id: cpio.magic,v 1.1 1994/02/21 21:51:51 rgrimes Exp $
+#	$Id: cpio.magic,v 1.2 1994/02/23 16:47:04 rgrimes Exp $
 #
 set_tmp_dir()
 {
 	def_tmp_dir=`pwd`
 	[ "$def_tmp_dir" = "/" ] && def_tmp_dir=/usr/distrib
-	echo -n "Copy files to which directory? [${def_tmp_dir}] "
+	echo -n "Where do we ${1:-put} the distrbution files? [${def_tmp_dir}] "
 	read tmp_dir
 	[ ! "$tmp_dir" ] && tmp_dir=$def_tmp_dir
 	if [ ! -d "$tmp_dir" ]; then
@@ -17,7 +17,7 @@ set_tmp_dir()
 tmp_dir()
 {
 	if [ "$tmp_dir" = "" ]; then
-		set_tmp_dir
+		set_tmp_dir $1
 	fi
 	cd $tmp_dir
 }
@@ -210,6 +210,10 @@ load_fd()
 	echo "Working directory: `pwd`"
 	unset verbose answer drive altdrive device dir subdir tmp interactive
 }
+load_dos()
+{
+	load_fd
+}
 load_qic_tape()
 {
 	tmp_dir
@@ -226,7 +230,8 @@ load_scsi_tape()
 }
 extract()
 {
-	tmp_dir
+	[ X"$1" = X"" ] && { echo "usage: extract dist-prefix"; return; }
+	tmp_dir find
 	echo -n "Would you like to be verbose about this? [n] "
 	read verbose
 	case $verbose in
@@ -249,6 +254,8 @@ extract()
 	done
 	rm -f /tmp/cat /tmp/gunzip /tmp/tar
 	sync
+	[ X"$1" = X"bin" ] && echo "Run \`configure' to complete installation." 
+	echo "(wd is now: `pwd`)"
 }
 configure()
 {
diff --git a/etc/etc.i386/cpio.rc b/etc/etc.i386/cpio.rc
index 54fb6b8..e8c782d 100644
--- a/etc/etc.i386/cpio.rc
+++ b/etc/etc.i386/cpio.rc
@@ -1,4 +1,4 @@
-#	$Id$
+#	$Id: cpio.rc,v 1.1 1994/02/21 21:51:53 rgrimes Exp $
 #
 
 stty status '^T'
@@ -70,7 +70,7 @@ echo "in a place with lots of space, probably under /usr."
 echo "Then, load the remaining distribution files into that temporary"
 echo "directory by issuing one of the following commands:"
 echo
-echo "	load_fd		load_qic_tape	load_scsi_tape"
+echo "	load_dos	load_fd	load_qic_tape	load_scsi_tape"
 echo
 echo "or by fetching the files with ftp (see the installation notes for"
 echo "information on how to do that)."
diff --git a/etc/etc.i386/inst1.install b/etc/etc.i386/inst1.install
index 3cb0909..d9812cf 100755
--- a/etc/etc.i386/inst1.install
+++ b/etc/etc.i386/inst1.install
@@ -970,7 +970,7 @@ echo "mount -at ufs"
 echo "echo" 
 echo "echo" 
 echo "echo	\"Insert cpio installation floppy in drive and\""
-echo "echo -n	\"enter that drive's number (0 or 1): [0] \""
+echo "echo -n	\"enter that drive's number (0 = A:,  1 = B:): [0] \""
 echo "read resp junk"
 echo "driveno=\${resp:-0}"
 echo "mount -o ro /dev/fd\${driveno} /mnt"
@@ -984,10 +984,11 @@ echo "read resp junk"
 echo "case \"\$resp\" in"
 echo "y*|Y*)"
 echo "	echo"	
-echo "	echo	\"Remove cpio floppy from drive, insert dos floppy, and\""
+echo "	echo	\"Insert dos floppy in drive, and then\""
 echo "	echo -n	\"enter that drive's number (0 or 1): [0] \""
 echo "	read resp junk"
 echo "	driveno=\${resp:-0}"
+echo "  echo	\"Copying files to /usr/distbin...\""
 echo "	mount -t pcfs -o ro /dev/fd\${driveno} /mnt"
 echo "	mkdir -p /usr/distbin"
 echo "	cp /mnt/* /usr/distbin/ >/dev/null 2>&1"
diff --git a/etc/etc.i386/inst2.rc b/etc/etc.i386/inst2.rc
index 231a8ec..531c927 100644
--- a/etc/etc.i386/inst2.rc
+++ b/etc/etc.i386/inst2.rc
@@ -1,4 +1,4 @@
-#	$Id$
+#	$Id: inst2.rc,v 1.1 1994/02/21 21:51:58 rgrimes Exp $
 #
 
 stty status '^T'
@@ -73,7 +73,7 @@ echo "in a place with lots of space, probably under /usr."
 echo "Then, load the remaining distribution files into that temporary"
 echo "directory by issuing one of the following commands:"
 echo
-echo "	load_fd		load_qic_tape	load_scsi_tape"
+echo "	load_dos	load_fd		load_qic_tape	load_scsi_tape"
 echo
 echo "or by fetching the files with ftp (see the installation notes for"
 echo "information on how to do that)."
@@ -85,7 +85,7 @@ echo
 echo "Once all of the filesets you wish to install have been extracted,"
 echo "enter the command 'configure' to finish setting up the system"
 echo " "
-echo "If you should wish to uninstall ${OPSYSTEM}, delete the partition by using the"
+echo "If you wish to uninstall ${OPSYSTEM}, delete the partition by using the"
 echo "DOS 5 FDISK program. If installed on the entire drive, use the FDISK/MBR"
 echo "to remove the ${OPSYSTEM} bootstrap from the drive."
 echo 'erase ^?, werase ^H, kill ^U, intr ^C'
@@ -302,6 +302,10 @@ load_fd()
 	echo "Working directory: `pwd`"
 	unset verbose answer drive altdrive device dir subdir tmp interactive
 }
+load_dos
+{
+	load_fd
+}
 load_qic_tape()
 {
 	tmp_dir
diff --git a/etc/etc.i386/install_notes b/etc/etc.i386/install_notes
index 7a915af..2a9d0d0 100644
--- a/etc/etc.i386/install_notes
+++ b/etc/etc.i386/install_notes
@@ -707,7 +707,7 @@ may hit Control-C at any prompt and then type `halt'.
 		After you have chosen a temporary directory,
 		you should issue the appropriate load command:
 
-			load_fd - for loading from a MS-DOS hard disk 
+			load_dos - for loading from a MS-DOS hard disk 
 				partition, or from floppies,
 			
 			load_qic_tape - for loading from QIC-02 tape, or
@@ -725,7 +725,7 @@ may hit Control-C at any prompt and then type `halt'.
 			# st -f /dev/nrst0 low_dnsty 16
 			# load_scsi_tape
 
-		If loading from floppy or hard disk, the load_fd
+		If loading from floppy or hard disk, the load_dos
 		command prompts for information, such as to which
 		floppy drive or hard disk directory to load from.
 		Additional options are available, e.g., for listing
@@ -735,7 +735,7 @@ may hit Control-C at any prompt and then type `halt'.
 		Go to the directory which contains the first
 		distribution set you wish to install.  This is
 		either the directory you specified above, if using
-		load_fd, or possibly a subdirectory of that
+		load_dos, or possibly a subdirectory of that
 		directory, if you loaded from tape.
 
 		When there, run "set_tmp_dir" again, and choose
@@ -956,7 +956,7 @@ Further Tips on Installing FreeBSD
 
 	This will cause the system to go into single-user mode, and
 	the install profile will be active (i.e., you will find the
-	commands load_fd, extract etc available to you again).
+	commands load_dos, extract etc available to you again).
 
 	If your disk has several operating systems, you may want
 	to install a boot manager such as Thomas Wolfram's os-bs
@@ -1053,4 +1053,4 @@ THANKS FOR USING THIS; that's what makes it all worthwhile.
  as they will end up in our personal mail spools.  We will be
  happy to make other arrangements]
 
-This is $Id: install_notes,v 1.12 1994/02/09 05:26:16 rgrimes Exp $
+This is $Id: install_notes,v 1.13 1994/02/22 17:11:27 rgrimes Exp $