base_create: Set IPNUM=$FIRSTIP
authorMartin Schwenke <martin@meltin.net>
Mon, 24 Nov 2014 09:47:12 +0000 (20:47 +1100)
committerMartin Schwenke <martin@meltin.net>
Mon, 24 Nov 2014 09:47:12 +0000 (20:47 +1100)
This allows removal of a kludge in guess_install_network().

Signed-off-by: Martin Schwenke <martin@meltin.net>
autocluster

index 7e259d2ad392853a90b4beaea898e03c16e1700b..62cbdfd042bbbda97e596bf9d4b68061c7019ef1 100755 (executable)
@@ -726,7 +726,7 @@ guess_install_network ()
            case "$o" in
                gw\=*)
                    INSTALL_GW="${o#gw=}"
-                   INSTALL_IP="${ip}${FIRSTIP}"
+                   INSTALL_IP="$ip"
            esac
        done
        [ -n "$INSTALL_IP" ] || INSTALL_IP="$ip"
@@ -761,6 +761,7 @@ base_create()
 
     setup_timezone
 
+    IPNUM=$FIRSTIP
     make_network_map
 
     guess_install_network