diff options
Diffstat (limited to 'release')
-rwxr-xr-x | release/bininst | 5 | ||||
-rw-r--r-- | release/netinst.sh | 53 |
2 files changed, 40 insertions, 18 deletions
diff --git a/release/bininst b/release/bininst index f99485e..9752ef0 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.47 1994/11/20 14:49:46 jkh Exp $ +# $Id: bininst,v 1.48 1994/11/21 02:17:06 jkh Exp $ if [ "$_BININST_LOADED_" = "yes" ]; then echo "Error, $0 loaded more than once!" @@ -42,6 +42,7 @@ trap interrupt 1 2 15 # set initial defaults set_defaults() { + network_set_defaults media_set_defaults installing="yes" mkdir -p ${TMP} @@ -64,6 +65,8 @@ to go, please remove the cpio floppy from the drive and press return!" -1 -1 do_last_config() { + if [ "$hostname" = "" ]; then network_basic_setup; fi + dialog --title "Final Configuration!" --menu \ "We now come to the end of the installation. If there's a\n\ floppy in the boot drive, now would probably be a good time\n\ diff --git a/release/netinst.sh b/release/netinst.sh index 1a958cf..8a5ce20 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: netinst.sh,v 1.8 1994/11/21 04:35:26 jkh Exp $ +# $Id: netinst.sh,v 1.9 1994/11/21 05:36:01 jkh Exp $ if [ "$_NETINST_SH_LOADED_" = "yes" ]; then return 0 @@ -26,6 +26,40 @@ ROUTE_FLAGS="add default" # Grab the miscellaneous functions. . /stand/miscfuncs.sh +network_set_defaults() +{ + hostname="" + domain="" + ipaddr="127.0.0.1" +} + +network_basic_setup() +{ + hostname="" + while [ "$hostname" = "" ]; do + default_value="" + if ! network_dialog "What is the fully qualified name of this host?"; then return 1; fi + if [ "$answer" = "" ]; then + error "You must select a host name!" + continue + else + hostname=$answer + fi + done + echo $hostname > /etc/myname + hostname $hostname + + default_value=`echo $hostname | sed -e 's/[^.]*\.//'` + if network_dialog "What is the domain name of this host (Internet, not YP/NIS)?"; then + domain=$answer + fi + + default_value="$ipaddr" + if ! network_dialog "What is the IP address of this host?"; then return 1; fi + ipaddr=$answer + echo "$ipaddr $hostname `echo $hostname | sed -e 's/\.$domain//'`" >> /etc/hosts +} + network_setup_ether() { dialog $clear --title "Ethernet Interface Name" \ @@ -116,22 +150,7 @@ network_setup() esac if [ "$interface" = "" ]; then continue; fi - default_value="" - if ! network_dialog "What is the fully qualified name of this host?"; then return 1; fi - hostname=$answer - echo $hostname > /etc/myname - hostname $hostname - - default_value=`echo $hostname | sed -e 's/[^.]*\.//'` - if network_dialog "What is the domain name of this host (Internet, not YP/NIS)?"; then - domain=$answer - fi - - default_value="" - if ! network_dialog "What is the IP address of this host?"; then return 1; fi - ipaddr=$answer - - echo "$ipaddr $hostname `echo $hostname | sed -e 's/\.$domain//'`" >> /etc/hosts + network_basic_setup default_value="$netmask" if network_dialog "Please specify the netmask"; then |