From ad904fdd379ee2fd3861ec2f130bf92917100584 Mon Sep 17 00:00:00 2001 From: Darren 'Tadgy' Austin Date: Wed, 18 Nov 2020 18:46:37 +0000 Subject: Use an IPv4 specific bounce file with IPv4 config. --- netconfig | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'netconfig') diff --git a/netconfig b/netconfig index 96daef5..8680388 100644 --- a/netconfig +++ b/netconfig @@ -632,18 +632,18 @@ If a net mask is not specified a default of 24 will be used. The first address entered will become the primary IPv4 address of this host. If you do not want to configure a static IPv4 address, just leave it blank or select 'Skip'." \ - 17 69 "${IPADDRS[*]}" 2> $TMP/SeTlip + 17 69 "${IPADDRS[*]}" 2> $TMP/SeTIPSv4 ERRNO="$?" if [ "$ERRNO" = "1" ]; then IPADDRS=() - rm -f $TMP/SeTIPSv4 $TMP/SeTlip + rm -f $TMP/SeTIPSv4 break elif [ "$ERRNO" = "255" ]; then - rm -f $TMP/SeTIPSv4 $TMP/SeTlip + rm -f $TMP/SeTIPSv4 exit fi - IPADDRS=($(cat $TMP/SeTlip)) - rm -f $TMP/SeTlip + IPADDRS=($(cat $TMP/SeTIPSv4)) + rm -f $TMP/SeTIPSv4 if [ "${IPADDRS[*]}" = "" ]; then rm -f $TMP/SeTIPSv4 break @@ -677,7 +677,7 @@ Valid net masks will be in the range 1-32." 6 65 continue 2 fi done - rm -f $TMP/SeTIPSv4 $TMP/SeTlip + rm -f $TMP/SeTIPSv4 break done @@ -701,7 +701,6 @@ Enter IPv4 gateway address:" 14 68 "$GATEWAY" 2> $TMP/SeTgateway4 GATEWAY="`cat $TMP/SeTgateway4`" rm -f $TMP/SeTgateway4 if [ "$GATEWAY" = "" ]; then - #echo > $TMP/SeTgateway4 break fi syntax_check_v4 "$GATEWAY" 4 WARN @@ -943,6 +942,7 @@ Netmask: 255.255.255.0 Is this correct? Press 'Yes' to continue, or 'No' to reconfigure." 10 70 RETVAL=$? +# FIXME: Need to actually set IPADDRS=127.0.0.1/8 here elif [ "$LOOPBACK" = "yes" -a "$NETWORKMANAGER" = "yes" ]; then dialog --title "NETWORK SETUP COMPLETE" --yesno "Your networking \ system is now configured to use NetworkManager for -- cgit v1.2.3