[gentoo-commits] gli r1891 - in trunk: . src

[gentoo-commits] gli r1891 - in trunk: . src

[Andrew Gaffney (agaffney)]

Author: agaffney
Date: 2008-04-06 16:55:22 +0000 (Sun, 06 Apr 2008)
New Revision: 1891

Modified:
   trunk/ChangeLog
   trunk/src/GLIArchitectureTemplate.py
Log:
Update post-install networking config to use newer conf.d/net syntax

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-04-05 16:34:42 UTC (rev 1890)
+++ trunk/ChangeLog	2008-04-06 16:55:22 UTC (rev 1891)
@@ -2,6 +2,10 @@
 # Copyright 2005-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  06 Apr 2008; Andrew Gaffney <agaffney@gentoo.org>
+  src/GLIArchitectureTemplate.py:
+  Update post-install networking config to use newer conf.d/net syntax
+
   05 Apr 2008; Andrew Gaffney <agaffney@gentoo.org>
   src/GLIArchitectureTemplate.py:
   run sed on copied make.conf to remove lines that start with ##

Modified: trunk/src/GLIArchitectureTemplate.py
===================================================================
--- trunk/src/GLIArchitectureTemplate.py	2008-04-05 16:34:42 UTC (rev 1890)
+++ trunk/src/GLIArchitectureTemplate.py	2008-04-06 16:55:22 UTC (rev 1891)
@@ -1198,7 +1198,7 @@
 			#		alias_netmasks = []
 					
 					# Write the static ip config to /etc/conf.d/net
-					self._edit_config(self._chroot_dir + "/etc/conf.d/net", {"iface_" + interface: ip + " broadcast " + broadcast + " netmask " + netmask})
+					self._edit_config(self._chroot_dir + "/etc/conf.d/net", {"config_" + interface: '( "' + ip + " netmask " + netmask + " broadcast " + broadcast + '" )'}, quotes_around_value=False)
 					
 					# If aliases are set
 			#		if aliases:
@@ -1224,7 +1224,9 @@
 					dhcpcd_options = interfaces[interface][1]
 					if not dhcpcd_options:
 						dhcpcd_options = ""
-					self._edit_config(self._chroot_dir + "/etc/conf.d/net", {"iface_" + interface: "dhcp", "dhcpcd_" + interface: dhcpcd_options})
+					self._edit_config(self._chroot_dir + "/etc/conf.d/net", {"config_" + interface: '( "dhcp" )'}, quotes_around_value=False)
+					if dhcpcd_options:
+						self._edit_config(self._chroot_dir + "/etc/conf.d/net", {"dhcpcd_" + interface: dhcpcd_options})
 					emerge_dhcp = True
 		if emerge_dhcp:
 			if self._debug: self._logger.log("DEBUG: setup_network_post(): emerging dhcpcd.")

-- 
gentoo-commits@lists.gentoo.org mailing list