diff --git a/release/Makefile b/release/Makefile index d665726c00f..9fc90612d62 100644 --- a/release/Makefile +++ b/release/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.30 1994/11/09 23:07:04 phk Exp $ +# $Id: Makefile,v 1.31 1994/11/10 05:27:56 jkh Exp $ # # Evil floppies are, of course, 1.2MB floppies. @@ -22,7 +22,7 @@ CPIO1+= mt mv rcp rm rmdir sh sleep stty sync test [ -sh CPIO1+= badsect chown clri disklabel dump dmesg fdisk fsck ifconfig init CPIO1+= mknod mount mount_cd9660 mount_msdos mount_nfs ncftp newfs ping pwd CPIO1+= reboot restore slattach swapon umount route -CPIO1+= rdump rrestore halt +CPIO1+= rdump rrestore halt ft CPIO1+= ftp rsh sed telnet rlogin grep CPIO2= etc/services etc/protocols diff --git a/release/bininst b/release/bininst index 449bb6c09ae..bafe5e69cad 100755 --- a/release/bininst +++ b/release/bininst @@ -13,7 +13,7 @@ # your name on top after doing something trivial like reindenting it, just # to make it look like you wrote it!). # -# $Id: bininst,v 1.23 1994/11/09 23:02:11 jkh Exp $ +# $Id: bininst,v 1.24 1994/11/10 05:27:57 jkh Exp $ # Some useful constants. PATH=/usr/bin:/usr/sbin:/bin:/sbin:/stand @@ -134,7 +134,7 @@ for you then your best bet may be to simply hit ESC twice to get \n\ a subshell and proceed manually on your own. If you are already \n\ finished with installation, select cancel to go on.\n\n\ Please choose one of the following:" 20 72 5 \ - "Tape" "Load distribution from SCSI or QIC tape" \ + "Tape" "Load distribution from SCSI, QIC or floppy tape" \ "CDROM" "Load distribution from SCSI or Mitsumi CDROM" \ "DOS" "Load from DOS floppies or a DOS hard disk partition" \ "FTP" "Load distribution using FTP" \ @@ -150,9 +150,10 @@ finished with installation, select cancel to go on.\n\n\ dialog $clear --title "Chose Tape Type" \ --menu "Which type of tape drive do you have attached to your \n\ system? FreeBSD supports the following types:\n\n\ - Choose one of the following:" 20 72 2 \ + Choose one of the following:" 20 72 3 \ "SCSI" "SCSI tape drive attached to supported SCSI controller" \ "QIC" "QIC tape drive (Colorado Jumbo, etc)" \ + "floppy" "Floppy tape drive" \ 2> ${TMP}/menu.tmp.$$ retval=$? choice=`cat ${TMP}/menu.tmp.$$` @@ -166,6 +167,9 @@ system? FreeBSD supports the following types:\n\n\ QIC) media_device=/dev/rwt0 ;; + floppy) + media_device=ftape + ;; esac ;; CDROM) @@ -419,8 +423,13 @@ install_set() if ! set_tmpdir; then return; fi if ! cd_tmpdir; then return; fi confirm "Please mount tape for ${media_device}." - dialog --title "Results of tape extract" $clear \ - --prgbox "$TAR $TAR_FLAGS $media_device" 10 72 + if [ "$media_device" = "ftape" ]; then + dialog --title "Results of tape extract" $clear \ + --prgbox "ft | $TAR $TAR_FLAGS -" 10 72 + else + dialog --title "Results of tape extract" $clear \ + --prgbox "$TAR $TAR_FLAGS $media_device" 10 72 + fi extract_dist rm_tmpdir ;;