diff options
| -rwxr-xr-x | release/bininst | 4 | ||||
| -rw-r--r-- | release/extract.sh | 12 | ||||
| -rw-r--r-- | release/instdist.sh | 64 | ||||
| -rw-r--r-- | release/miscfuncs.sh | 10 | ||||
| -rw-r--r-- | release/netinst.sh | 4 |
5 files changed, 60 insertions, 34 deletions
diff --git a/release/bininst b/release/bininst index a9c8208..4643c4a 100755 --- a/release/bininst +++ b/release/bininst @@ -13,7 +13,7 @@ # putting your name on top after doing something trivial like reindenting # it, just to make it look like you wrote it!). # -# $Id: bininst,v 1.38 1994/11/15 13:40:00 jkh Exp $ +# $Id: bininst,v 1.39 1994/11/16 07:51:41 jkh Exp $ if [ "$_BININST_LOADED_" = "yes" ]; then echo "Error, $0 loaded more than once!" @@ -80,7 +80,7 @@ available which you may wish to investigate. Look in: ftp://ftp.freebsd.org/pub/FreeBSD/${DISTNAME}/packages Any install-related comments to jkh@freebsd.org, phk@freebsd.org or -paul@freebsd.org." 22 72 +paul@freebsd.org." -1 -1 } welcome diff --git a/release/extract.sh b/release/extract.sh index e94b641..84c307f 100644 --- a/release/extract.sh +++ b/release/extract.sh @@ -1,6 +1,6 @@ #!/bin/sh -# $Id: extract.sh,v 1.9 1994/11/11 23:27:05 jkh Exp $ - +# $Id: extract.sh,v 1.10 1994/11/12 09:55:29 jkh Exp $ +PATH=/stand:$PATH DDIR=/ if [ -f bin_tgz.aa ] ; then @@ -8,10 +8,8 @@ if [ -f bin_tgz.aa ] ; then if [ -f $DDIR/etc/myname ]; then cp $DDIR/etc/hosts $DDIR/etc/myname $DDIR/stand/etc fi - echo; echo "Extracting bindist, please wait. Ignore any messages from" - echo "cpio saying \"No such file or directory\". It doesn't know what" - echo "it's talking about.."; echo - cat bin_tgz.?? | zcat | ( cd $DDIR ; cpio -H tar -idumV ) + echo; echo "Extracting bindist, please wait." + cat bin_tgz.?? | gzip -c -d | tar --unlink -xvf - -C $DDIR if [ -f $DDIR/stand/etc/myname ]; then # Add back what the bindist nuked. cp $DDIR/stand/etc/myname $DDIR/etc @@ -29,6 +27,6 @@ do mv /sbin/init /sbin/nondes_init fi echo "Extracting $b" - cat $b.?? | zcat | ( cd $DDIR ; cpio -H tar -idumV ) + cat $b.?? | gzip -c -d | tar --unlink -xvf - -C $DDIR fi done diff --git a/release/instdist.sh b/release/instdist.sh index c4bbfe9..2172a30 100644 --- a/release/instdist.sh +++ b/release/instdist.sh @@ -10,7 +10,7 @@ # putting your name on top after doing something trivial like reindenting # it, just to make it look like you wrote it!). # -# $Id$ +# $Id: instdist.sh,v 1.1 1994/11/16 07:51:42 jkh Exp $ if [ "$_INSTINST_SH_LOADED_" = "yes" ]; then return 0 @@ -85,12 +85,48 @@ media_cd_tmpdir() media_rm_tmpdir() { cd / - if dialog --title "Delete contents?" $clear \ - --yesno "Do you wish to delete the contents of ${tmp_dir}?" 5 72; then + if dialog --title "Delete contents?" $clear --yesno \ + "Do you wish to delete the contents of ${tmp_dir}?" -1 -1; then rm -rf $tmp_dir/* fi } +media_select_ftp_site() +{ + dialog $clear --title "Please specify an ftp site" \ + --menu \ +"FreeBSD is distributed from a number of sites on the Internet \n\ +in order to more evenly distribute network load and increase \n\ +its availability users who might be far from the main ftp sites \n\ +or unable to get a connection. Please select the site closest \n\ +to you or select \"other\" if you'd like to specify your own \n\ +choice.\n\n" 20 76 4 \ +"Please select one of the following:" 20 76 6 \ + "ftp://ftp.freebsd.org/pub/FreeBSD/${DISTNAME}" "Primary U.S. ftp site" \ + "ftp://netbsd.csie.nctu.edu.tw/pub/FreeBSD/${DISTNAME}" "Taiwan" \ + "ftp://ftp.physics.usyd.edu.au/FreeBSD/${DISTNAME}" "Australia" \ + "ftp://ftp.ibp.fr/pub/freeBSD/${DISTNAME}" "France" \ + "ftp://nic.funet.fi:/pub/unix/FreeBSD/${DISTNAME}" "Finland" \ + "other" "None of the above. I want to specify my own." \ + 2> ${TMP}/menu.tmp.$$ + retval=$? + answer=`cat ${TMP}/menu.tmp.$$` + rm -f ${TMP}/menu.tmp.$$ + if ! handle_rval $retval; then return 1; fi + if [ "$answer" = "other" ]; then + title="FTP Installation Information" + default_value="$ftp_path" + if ! input \ +"Please specify the machine and directory location of the +distribution you wish to load. This should be either a \"URL style\" +specification (e.g. ftp://ftp.freeBSD.org/pub/FreeBSD/...) or simply +the name of a host to connect to. If only a host name is specified, +the installation assumes that you will properly connect and \"mget\" +the files yourself.\n\n"; then return 1; fi + fi + ftp_path=$answer +} + media_extract_dist() { if [ -f extract.sh ]; then @@ -185,7 +221,7 @@ and mandatory distributions are so noted. Please also note that \n\ the secrdist is NOT FOR EXPORT from the U.S.! Please don't \n\ endanger U.S. ftp sites by getting it illegally. Thank you!\n\n" \ "Please select one (we'll come back to this menu later):" 20 76 6 \ - "?diskfree" "Uh, first, how much disk space do I have free?" + "?diskfree" "Uh, first, how much disk space do I have free?" \ "bindist" "The ${DISTNAME} base distribution (mandatory - 80MB)" \ "srcdist" "The ${DISTNAME} source distribution (optional - 120MB)" \ "secrdist" "The ${DISTNAME} DES distribution (optional - 5MB)" \ @@ -342,23 +378,15 @@ drive it's /dev/fd1\n\n"; then ;; FTP) - if ! setup_network; then continue; fi - title="FTP Installation Information" - default_value="$ftp_path" - if ! input \ -"Please specify the machine and directory location of the -distribution you wish to load. This should be either a \"URL style\" -specification (e.g. ftp://ftp.freeBSD.org/pub/FreeBSD/...) or simply -the name of a host to connect to. If only a host name is specified, -the installation assumes that you will properly connect and \"mget\" -the files yourself.\n\n"; then continue; fi - media_type=ftp - media_device=$answer - ftp_path=$media_device + if ! network_setup; then continue; fi + if media_select_ftp_site; then + media_type=ftp + media_device=$ftp_path + fi ;; NFS) - if ! setup_network; then continue; fi + if ! network_setup; then continue; fi title="NFS Installation Information" default_value="$nfs_path" if ! input \ diff --git a/release/miscfuncs.sh b/release/miscfuncs.sh index f899850..ab1e222 100644 --- a/release/miscfuncs.sh +++ b/release/miscfuncs.sh @@ -10,7 +10,7 @@ # putting your name on top after doing something trivial like reindenting # it, just to make it look like you wrote it!). # -# $Id$ +# $Id: miscfuncs.sh,v 1.1 1994/11/16 07:51:43 jkh Exp $ if [ "$_MISCFUNCS_SH_LOADED_" = "yes" ]; then return 0 @@ -24,7 +24,7 @@ DISTNAME=2.0-ALPHA interrupt() { if dialog --clear --title "User Interrupt Requested" \ - --yesno "Do you wish to abort the installation?" 5 70; then + --yesno "Do you wish to abort the installation?" -1 -1; then exit 0; fi } @@ -47,7 +47,7 @@ handle_rval() { # A simple user-confirmation dialog. confirm() { - dialog --title "User Confirmation" --msgbox "$*" 8 72 + dialog --title "User Confirmation" --msgbox "$*" -1 -1 } # A simple message box dialog. @@ -57,7 +57,7 @@ message() { # A simple error dialog. error() { - dialog --title "Error!" --msgbox "$*" 10 72 + dialog --title "Error!" --msgbox "$*" -1 -1 } # Something isn't supported yet! :-( @@ -72,7 +72,7 @@ expect it to be in the release. Please press RETURN to go on." 10 60 input() { dialog --title "$title" $clear \ - --inputbox "$*" 17 72 "$default_value" 2> ${TMP}/inputbox.tmp.$$ + --inputbox "$*" -1 -1 "$default_value" 2> ${TMP}/inputbox.tmp.$$ if ! handle_rval $?; then rm -f ${TMP}/inputbox.tmp.$$; return 1; fi answer=`cat ${TMP}/inputbox.tmp.$$` rm -f ${TMP}/inputbox.tmp.$$ diff --git a/release/netinst.sh b/release/netinst.sh index 417293a..3afc72a 100644 --- a/release/netinst.sh +++ b/release/netinst.sh @@ -10,7 +10,7 @@ # putting your name on top after doing something trivial like reindenting # it, just to make it look like you wrote it!). # -# $Id: bininst,v 1.38 1994/11/15 13:40:00 jkh Exp $ +# $Id: netinst.sh,v 1.1 1994/11/16 07:51:45 jkh Exp $ if [ "$_NETINST_SH_LOADED_" = "yes" ]; then return 0 @@ -63,7 +63,7 @@ network_setup_slip() serial_speed=$answer clear="--clear" - if dialog $clear --title "Dial" --yesno "Do you need to dial the phone or otherwise talk to the modem?"; then + if dialog $clear --title "Dial" --yesno "Do you need to dial the phone or otherwise talk to the modem?" -1 -1; then mkdir -p /var/log touch -f /var/log/aculog > /dev/null 2>&1 chmod 666 /var/log/aculog > /dev/null 2>&1 |
