More fixes from Keith Walker. Thanks, Keith!

This commit is contained in:
Jordan K. Hubbard 1994-12-01 13:46:13 +00:00
parent 64499a1b6c
commit 290f426469
2 changed files with 19 additions and 13 deletions

View File

@ -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

View File

@ -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()
{