diff options
| author | jkh <jkh@FreeBSD.org> | 1994-12-01 13:46:13 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1994-12-01 13:46:13 +0000 |
| commit | ec8bbabc02f2d0e762d6c7bdcccba6c3164c310d (patch) | |
| tree | 55b51f0eb15b3bbd528b6b72522d64259d87edb5 /release | |
| parent | cc38bfcd7d4f22e72474a43bbc2b109b45759392 (diff) | |
| download | FreeBSD-src-ec8bbabc02f2d0e762d6c7bdcccba6c3164c310d.zip FreeBSD-src-ec8bbabc02f2d0e762d6c7bdcccba6c3164c310d.tar.gz | |
More fixes from Keith Walker. Thanks, Keith!
Diffstat (limited to 'release')
| -rw-r--r-- | release/instdist.sh | 8 | ||||
| -rw-r--r-- | release/miscfuncs.sh | 24 |
2 files changed, 19 insertions, 13 deletions
diff --git a/release/instdist.sh b/release/instdist.sh index efcce71..e76ea63 100644 --- a/release/instdist.sh +++ b/release/instdist.sh @@ -149,7 +149,7 @@ media_extract_dist() if sh ./do_cksum.sh; then if [ -f extract.sh ]; then message "Extracting ${MEDIA_DISTRIBUTION} distribution. Please wait!" - if [ -f ./.is_interactive]; then + if [ -f ./is_interactive ]; then sh ./extract.sh else sh ./extract.sh < /dev/ttyv1 > /dev/ttyv1 2>&1 @@ -397,6 +397,7 @@ system? FreeBSD supports the following types:\n" -1 -1 2 \ else MEDIA_DEVICE=${MNT} media_get_possible_subdir + return 0 fi ;; @@ -418,9 +419,11 @@ drive it's /dev/fd1\n"; then MEDIA_TYPE=doshd MEDIA_DEVICE=${MNT} media_get_possible_subdir + return 0 fi else MEDIA_TYPE=dosfd + return 0 fi fi ;; @@ -430,6 +433,7 @@ drive it's /dev/fd1\n"; then if media_select_ftp_site; then MEDIA_TYPE=ftp MEDIA_DEVICE=${FTP_PATH} + return 0 fi ;; @@ -465,6 +469,7 @@ Options, if any, should be separated by commas."; then message "${NFS_PATH} mounted successfully" MEDIA_DEVICE=${MNT} media_get_possible_subdir + return 0 fi ;; @@ -480,6 +485,7 @@ of the distribution's parent directory when we come back." -1 -1 if input "Ok, now give me the full pathname of the parent directorys for the distribution(s)."; then MEDIA_TYPE=ufs MEDIA_DEVICE=${ANSWER} + return 0 fi ;; esac diff --git a/release/miscfuncs.sh b/release/miscfuncs.sh index 0d2510e..6afca29 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: miscfuncs.sh,v 1.10 1994/11/22 09:02:46 jkh Exp $ +# $Id: miscfuncs.sh,v 1.11 1994/11/28 22:13:06 jkh Exp $ if [ "${_MISCFUNCS_SH_LOADED_}" = "yes" ]; then return 0 @@ -49,17 +49,17 @@ HOME=/; export HOME TMP=/tmp # Commands and flags -FT_CMD= "ft" -TAR_CMD= "tar" -TAR_FLAGS= "--unlink -xvf" -IFCONFIG_CMD= "ifconfig" -ROUTE_CMD= "route" -ROUTE_FLAGS= "add default" -HOSTNAME_CMD= "hostname" -SLATTACH_CMD= "slattach" -SLATTACH_FLAGS= "-l -a -s" -PPPD_CMD= "pppd" -PPPD_FLAGS= "crtscts defaultroute -ip -mn netmask $netmask" +FT_CMD="ft" +TAR_CMD="tar" +TAR_FLAGS="--unlink -xvf" +IFCONFIG_CMD="ifconfig" +ROUTE_CMD="route" +ROUTE_FLAGS="add default" +HOSTNAME_CMD="hostname" +SLATTACH_CMD="slattach" +SLATTACH_FLAGS="-l -a -s" +PPPD_CMD="pppd" +PPPD_FLAGS="crtscts defaultroute -ip -mn netmask $netmask" interrupt() { |
