--- alx-src/trunk/alxconfig-ng/functions/config_network.sh	2005/10/10 18:43:58	353
+++ alx-src/trunk/alxconfig-ng/functions/config_network.sh	2005/10/11 12:09:52	367
@@ -1,4 +1,4 @@
-# $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/functions/config_network.sh,v 1.12 2005-10-10 18:43:58 niro Exp $
+# $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/functions/config_network.sh,v 1.13 2005-10-11 12:09:52 niro Exp $
 # configures networkin on the host via mysql db settings
 
 get_network_settings()
@@ -8,7 +8,8 @@
 	# all arrays:
 	# ->  hostname modules domain networking ip netmask dns gateway broadcast
 
-	all=$(mysqldo "select hostname,
+	all=$(mysqldo "select iface,
+			hostname,
 			module,
 			domain,
 			networking,
@@ -16,8 +17,7 @@
 			netmask,
 			dns,
 			gateway,
-			broadcast,
-			iface
+			broadcast
 		from cfg_network where serial='${ALX_SERIAL}'")
 
 	# split'em up and put 'em in an array
@@ -29,16 +29,16 @@
 	done
 
 	# and now put in usable var names and export them systemwide
-	export ALX_HOSTNAME="${DB_NETWORK[0]:=NULL}"
-	export ALX_MODULE="${DB_NETWORK[1]:=NULL}"
-	export ALX_DOMAIN="${DB_NETWORK[2]:=NULL}"
-	export ALX_NETWORKING="${DB_NETWORK[3]:=NULL}"
-	export ALX_IP="${DB_NETWORK[4]:=NULL}"
-	export ALX_NETMASK="${DB_NETWORK[5]:=NULL}"
-	export ALX_DNS="${DB_NETWORK[6]:=NULL}"
-	export ALX_GATEWAY="${DB_NETWORK[7]:=NULL}"
-	export ALX_BROADCAST="${DB_NETWORK[8]:=NULL}"
-	export ALX_IFACE="${DB_NETWORK[9]:=NULL}"
+	export ALX_IFACE="${DB_NETWORK[0]:=NULL}"
+	export ALX_HOSTNAME="${DB_NETWORK[1]:=NULL}"
+	export ALX_MODULE="${DB_NETWORK[2]:=NULL}"
+	export ALX_DOMAIN="${DB_NETWORK[3]:=NULL}"
+	export ALX_NETWORKING="${DB_NETWORK[4]:=NULL}"
+	export ALX_IP="${DB_NETWORK[5]:=NULL}"
+	export ALX_NETMASK="${DB_NETWORK[6]:=NULL}"
+	export ALX_DNS="${DB_NETWORK[7]:=NULL}"
+	export ALX_GATEWAY="${DB_NETWORK[8]:=NULL}"
+	export ALX_BROADCAST="${DB_NETWORK[9]:=NULL}"
 
 	# the new mac address hack
 	export ALX_FORCEMACTO=$(mysqldo "select forcemacto from cfg_network where serial='${ALX_SERIAL}'")