Josh Littlefield's fixes for my extreme boneheadedness.

This commit is contained in:
Jordan K. Hubbard 1994-12-02 15:52:55 +00:00
parent 7184c6cea1
commit 6413d9a335
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=4901
2 changed files with 6 additions and 6 deletions

View File

@ -13,7 +13,7 @@
# putting your name on top after doing something trivial like reindenting # putting your name on top after doing something trivial like reindenting
# it, just to make it look like you wrote it!). # it, just to make it look like you wrote it!).
# #
# $Id: bininst,v 1.51 1994/11/28 22:13:03 jkh Exp $ # $Id: bininst,v 1.52 1994/11/30 11:58:28 jkh Exp $
if [ "${_BININST_LOADED_}" = "yes" ]; then if [ "${_BININST_LOADED_}" = "yes" ]; then
error "Error, $0 loaded more than once!" error "Error, $0 loaded more than once!"
@ -68,7 +68,7 @@ to remove it as the system will reboot when you exit the shell\n\
at the end of this stage.\n\n\ at the end of this stage.\n\n\
Please select one of the following options:" -1 -1 5 \ Please select one of the following options:" -1 -1 5 \
"tzsetup" "Configure your time zone" \ "tzsetup" "Configure your time zone" \
"network" "Configure networking" "network" "Configure networking" \
"user" "Add a user name for yourself to the system" \ "user" "Add a user name for yourself to the system" \
"guest" "Simply add a user \"guest\" with all default options" \ "guest" "Simply add a user \"guest\" with all default options" \
"done" "Exit the installation." 2> ${TMP}/menu.tmp.$$ "done" "Exit the installation." 2> ${TMP}/menu.tmp.$$

View File

@ -10,7 +10,7 @@
# putting your name on top after doing something trivial like reindenting # putting your name on top after doing something trivial like reindenting
# it, just to make it look like you wrote it!). # it, just to make it look like you wrote it!).
# #
# $Id: netinst.sh,v 1.12 1994/11/28 22:13:07 jkh Exp $ # $Id: netinst.sh,v 1.13 1994/12/01 20:00:32 jkh Exp $
if [ "${_NETINST_SH_LOADED_}" = "yes" ]; then if [ "${_NETINST_SH_LOADED_}" = "yes" ]; then
return 0 return 0
@ -30,7 +30,7 @@ network_set_defaults()
IFCONFIG_FLAGS="" IFCONFIG_FLAGS=""
REMOTE_HOSTIP="" REMOTE_HOSTIP=""
REMOTE_IPADDR="" REMOTE_IPADDR=""
INTERFACE=lo0 INTERFACE=""
SERIAL_INTERFACE="/dev/tty00" SERIAL_INTERFACE="/dev/tty00"
SERIAL_SPEED="38400" SERIAL_SPEED="38400"
} }
@ -72,7 +72,7 @@ network_setup_ether()
"de0" "DEC PCI ethernet adapter (or compatible)" \ "de0" "DEC PCI ethernet adapter (or compatible)" \
"ie0" "AT&T StarLan and EN100 family at 0x360 and IRQ 7" \ "ie0" "AT&T StarLan and EN100 family at 0x360 and IRQ 7" \
"is0" "Isolan 4141-0 or Isolink 4110 at 0x280 and IRQ 7" \ "is0" "Isolan 4141-0 or Isolink 4110 at 0x280 and IRQ 7" \
"le0" "DEC Etherworks ethernet adapter" "le0" "DEC Etherworks ethernet adapter" \
"ze0" "PCMCIA IBM or National card at 0x300 and IRQ 5" \ "ze0" "PCMCIA IBM or National card at 0x300 and IRQ 5" \
2> ${TMP}/menu.tmp.$$ 2> ${TMP}/menu.tmp.$$
@ -196,7 +196,7 @@ network_setup()
${PPPD_CMD} ${PPPD_FLAGS} ${SERIAL_INTERFACE} ${SERIAL_SPEED} ${IPADDR}:${REMOTE_IPADDR} ${PPPD_CMD} ${PPPD_FLAGS} ${SERIAL_INTERFACE} ${SERIAL_SPEED} ${IPADDR}:${REMOTE_IPADDR}
progress ${PPPD_CMD} ${PPPD_FLAGS} ${SERIAL_INTERFACE} ${SERIAL_SPEED} ${IPADDR}:${REMOTE_IPADDR} progress ${PPPD_CMD} ${PPPD_FLAGS} ${SERIAL_INTERFACE} ${SERIAL_SPEED} ${IPADDR}:${REMOTE_IPADDR}
fi fi
echo "${IPADDR} ${REMOTE_IPADDR} netmask ${NETMASK} ${IFCONFIG_FLAGS}" > ${ETC}/hostname.$interface echo "${IPADDR} ${REMOTE_IPADDR} netmask ${NETMASK} ${IFCONFIG_FLAGS}" > ${ETC}/hostname.${INTERFACE}
DEFAULT_VALUE="" DEFAULT_VALUE=""
if network_dialog "If you have a default gateway, enter its IP address"; then if network_dialog "If you have a default gateway, enter its IP address"; then
if [ "${ANSWER}" != "" ]; then if [ "${ANSWER}" != "" ]; then