Attachment #1991 for bug #15438

Lines 88-93 Link Here

(-)debian/univention-config-registry.univention-config-registry-variables (+18 lines)
88	Type=str	88	Type=str
89	Categories=system-network	89	Categories=system-network
90		90
		91	[ipv6/gateway]
		92	Description[de]=Standard-IPv6-Gateway
		93	Description[en]=Default IPv6-gateway
		94	Type=str
		95	Categories=system-network
		96
91	[hostname]	97	[hostname]
92	Description[de]=Name des Rechners	98	Description[de]=Name des Rechners
93	Description[en]=Name of the computer	99	Description[en]=Name of the computer
Lines 148-153 Link Here
148	Type=str	154	Type=str
149	Categories=system-network	155	Categories=system-network
150		156
		157	[interfaces/eth.*/ipv6/address]
		158	Description[de]=IPv6-Adresse des Netz-Interfaces
		159	Description[en]=IPv6 address of the network interface
		160	Type=str
		161	Categories=system-network
		162
		163	[interfaces/eth.*/ipv6/netmask]
		164	Description[de]=IPv6-Netzwerkmaske des Netz-Interfaces
		165	Description[en]=IPv6 netmask of the network interface
		166	Type=str
		167	Categories=system-network
		168
151	[hosts/static/.*]	169	[hosts/static/.*]
152	Description[de]=Zusätzliche /etc/hosts Einträge	170	Description[de]=Zusätzliche /etc/hosts Einträge
153	Description[en]=Additional entries for /etc/hosts	171	Description[en]=Additional entries for /etc/hosts




univention-config-registry (5.1.4-1) unstable; urgency=low

  * merged version (Bug #15438)

 -- Kai-Wilhelm Bolte <bolte@univention.de>  Tue, 10 Nov 2009 14:40:18 +0100

univention-config-registry (5.1.3-2) unstable; urgency=low

  * fix in network/interfaces (Bug #15438)

 -- Kai-Wilhelm Bolte <bolte@univention.de>  Tue, 10 Nov 2009 14:28:23 +0100

univention-config-registry (5.1.3-1) unstable; urgency=low

  * merged version (Bug #15438)

 -- Kai-Wilhelm Bolte <bolte@univention.de>  Tue,  3 Nov 2009 15:12:11 +0100

univention-config-registry (5.1.2-1) unstable; urgency=low

  * generate better readable config-file (Bug #15438)

 -- Kai-Wilhelm Bolte <bolte@univention.de>  Tue,  3 Nov 2009 11:38:19 +0100

univention-config-registry (5.1.1-1) unstable; urgency=low

  * new UCR variable ipv6/gateway which will set a default IPv6 gateway if
    /ipv6/address exists (Bug #15438)
  
 -- Kai-Wilhelm Bolte <bolte@univention.de>  Thu, 20 Aug 2009 17:23:55 +0200

univention-config-registry (5.1.0-1) unstable; urgency=low

  * new UCR variables: interfaces/eth.*/ipv6/address
                       interfaces/eth.*/ipv6/netmask
    If variable address is set, there will be a static IPv6 address in 
    /etc/network/interfaces (Bug #15438)

 -- Kai-Wilhelm Bolte <bolte@univention.de>  Wed, 19 Aug 2009 13:27:49 +0200

univention-config-registry (5.0.52-1) unstable; urgency=low

  * set the UCS 2.3 codename to hornbeam. Bug #14412

Lines 101-111 Link Here

(-)debian/univention-config-registry.univention-config-registry (+5 lines)
101	Postinst: interfaces.py	101	Postinst: interfaces.py
102	Variables: interfaces/eth.*	102	Variables: interfaces/eth.*
103	Variables: gateway	103	Variables: gateway
		104	Variables: ipv6/gateway
104		105
105	Type: multifile	106	Type: multifile
106	Multifile: etc/hosts	107	Multifile: etc/hosts
107	Variables: interfaces/eth0/type	108	Variables: interfaces/eth0/type
108	Variables: interfaces/eth.*/address	109	Variables: interfaces/eth.*/address
		110	Variables: interfaces/eth.*/ipv6/address
		111	Variables: interfaces/eth.*/ipv6/netmask
109	Variables: interfaces/eth.*/hosts	112	Variables: interfaces/eth.*/hosts
110	Variables: hostname	113	Variables: hostname
111	Variables: domainname	114	Variables: domainname
Lines 115-120 Link Here
115	Multifile: etc/hosts	118	Multifile: etc/hosts
116	Subfile: etc/hosts.d/00-base	119	Subfile: etc/hosts.d/00-base
117	Variables: interfaces/eth.*/address	120	Variables: interfaces/eth.*/address
		121	Variables: interfaces/eth.*/ipv6/address
		122	Variables: interfaces/eth.*/ipv6/netmask
118	Variables: interfaces/eth.*/type	123	Variables: interfaces/eth.*/type
119	Variables: interfaces/eth.*/hosts	124	Variables: interfaces/eth.*/hosts
120	Variables: hostname	125	Variables: hostname




	elif  configRegistry['interfaces/eth%s/address' % i]:
		print 'auto eth%s' % i
		print 'iface eth%s inet static' % i
		print '     address '+configRegistry['interfaces/eth%s/address' % i]
		if configRegistry['interfaces/eth%s/network' % i]:
			print '     network '+configRegistry['interfaces/eth%s/network' % i]
		if configRegistry['interfaces/eth%s/netmask' % i]:
			print '     netmask '+configRegistry['interfaces/eth%s/netmask' % i]
		if configRegistry['interfaces/eth%s/broadcast' % i]:
			print '     broadcast '+configRegistry['interfaces/eth%s/broadcast' % i]
		if configRegistry['interfaces/eth%s/address' % i] and configRegistry['interfaces/eth%s/netmask' % i] and configRegistry['gateway'] and not gateway:
			if check_gateway(configRegistry['interfaces/eth%s/address' % i].split('.'), configRegistry['interfaces/eth%s/netmask' % i].split('.'), configRegistry['gateway'].split('.')):
				print 'gateway '+configRegistry['gateway']
				gateway=True
		configExists=True

	if configRegistry['interfaces/eth%s/ipv6/address' % i]: #IPv6
		print 'iface eth%s inet6 static' % i
		print '     address '+configRegistry['interfaces/eth%s/ipv6/address' % i]
	if configRegistry['interfaces/eth%s/ipv6/netmask' % i]:
		print '     netmask '+configRegistry['interfaces/eth%s/ipv6/netmask' % i]
	if configRegistry['interfaces/eth%s/ipv6/address' % i] and configRegistry['ipv6/gateway']:
		print '     gateway '+configRegistry['ipv6/gateway']

	for j in range(0,4):
		if configRegistry.has_key('interfaces/eth%s_%s/type' % (i,j)) and configRegistry['interfaces/eth%s_%s/type' % (i,j) ] == 'dhcp':
			if configRegistry.get('interfaces/eth%s_%s/networkmanager' % ( i, j ), 'yes' ).lower() in ( 'no', 'false', '0' ):

Return to bug 15438

Lines 1-3 Link Here

(-)debian/changelog (+40 lines)
		1	univention-config-registry (5.1.4-1) unstable; urgency=low
		2
		3	* merged version (Bug #15438)
		4
		5	-- Kai-Wilhelm Bolte <bolte@univention.de> Tue, 10 Nov 2009 14:40:18 +0100
		6
		7	univention-config-registry (5.1.3-2) unstable; urgency=low
		8
		9	* fix in network/interfaces (Bug #15438)
		10
		11	-- Kai-Wilhelm Bolte <bolte@univention.de> Tue, 10 Nov 2009 14:28:23 +0100
		12
		13	univention-config-registry (5.1.3-1) unstable; urgency=low
		14
		15	* merged version (Bug #15438)
		16
		17	-- Kai-Wilhelm Bolte <bolte@univention.de> Tue, 3 Nov 2009 15:12:11 +0100
		18
		19	univention-config-registry (5.1.2-1) unstable; urgency=low
		20
		21	* generate better readable config-file (Bug #15438)
		22
		23	-- Kai-Wilhelm Bolte <bolte@univention.de> Tue, 3 Nov 2009 11:38:19 +0100
		24
		25	univention-config-registry (5.1.1-1) unstable; urgency=low
		26
		27	* new UCR variable ipv6/gateway which will set a default IPv6 gateway if
		28	/ipv6/address exists (Bug #15438)
		29
		30	-- Kai-Wilhelm Bolte <bolte@univention.de> Thu, 20 Aug 2009 17:23:55 +0200
		31
		32	univention-config-registry (5.1.0-1) unstable; urgency=low
		33
		34	* new UCR variables: interfaces/eth.*/ipv6/address
		35	interfaces/eth.*/ipv6/netmask
		36	If variable address is set, there will be a static IPv6 address in
		37	/etc/network/interfaces (Bug #15438)
		38
		39	-- Kai-Wilhelm Bolte <bolte@univention.de> Wed, 19 Aug 2009 13:27:49 +0200
		40
1	univention-config-registry (5.0.52-1) unstable; urgency=low	41	univention-config-registry (5.0.52-1) unstable; urgency=low
2		42
3	* set the UCS 2.3 codename to hornbeam. Bug #14412	43	* set the UCS 2.3 codename to hornbeam. Bug #14412

Lines 38-56 Link Here

(-)conffiles/network/interfaces (-4 / +12 lines)
38	elif configRegistry['interfaces/eth%s/address' % i]:	38	elif configRegistry['interfaces/eth%s/address' % i]:
39	print 'auto eth%s' % i	39	print 'auto eth%s' % i
40	print 'iface eth%s inet static' % i	40	print 'iface eth%s inet static' % i
41	print 'address '+configRegistry['interfaces/eth%s/address' % i]	41	print ' address '+configRegistry['interfaces/eth%s/address' % i]
42	if configRegistry['interfaces/eth%s/network' % i]:	42	if configRegistry['interfaces/eth%s/network' % i]:
43	print 'network '+configRegistry['interfaces/eth%s/network' % i]	43	print ' network '+configRegistry['interfaces/eth%s/network' % i]
44	if configRegistry['interfaces/eth%s/netmask' % i]:	44	if configRegistry['interfaces/eth%s/netmask' % i]:
45	print 'netmask '+configRegistry['interfaces/eth%s/netmask' % i]	45	print ' netmask '+configRegistry['interfaces/eth%s/netmask' % i]
46	if configRegistry['interfaces/eth%s/broadcast' % i]:	46	if configRegistry['interfaces/eth%s/broadcast' % i]:
47	print 'broadcast '+configRegistry['interfaces/eth%s/broadcast' % i]	47	print ' broadcast '+configRegistry['interfaces/eth%s/broadcast' % i]
48	if configRegistry['interfaces/eth%s/address' % i] and configRegistry['interfaces/eth%s/netmask' % i] and configRegistry['gateway'] and not gateway:	48	if configRegistry['interfaces/eth%s/address' % i] and configRegistry['interfaces/eth%s/netmask' % i] and configRegistry['gateway'] and not gateway:
49	if check_gateway(configRegistry['interfaces/eth%s/address' % i].split('.'), configRegistry['interfaces/eth%s/netmask' % i].split('.'), configRegistry['gateway'].split('.')):	49	if check_gateway(configRegistry['interfaces/eth%s/address' % i].split('.'), configRegistry['interfaces/eth%s/netmask' % i].split('.'), configRegistry['gateway'].split('.')):
50	print 'gateway '+configRegistry['gateway']	50	print 'gateway '+configRegistry['gateway']
51	gateway=True	51	gateway=True
52	configExists=True	52	configExists=True
53		53
		54	if configRegistry['interfaces/eth%s/ipv6/address' % i]: #IPv6
		55	print 'iface eth%s inet6 static' % i
		56	print ' address '+configRegistry['interfaces/eth%s/ipv6/address' % i]
		57	if configRegistry['interfaces/eth%s/ipv6/netmask' % i]:
		58	print ' netmask '+configRegistry['interfaces/eth%s/ipv6/netmask' % i]
		59	if configRegistry['interfaces/eth%s/ipv6/address' % i] and configRegistry['ipv6/gateway']:
		60	print ' gateway '+configRegistry['ipv6/gateway']
		61
54	for j in range(0,4):	62	for j in range(0,4):
55	if configRegistry.has_key('interfaces/eth%s_%s/type' % (i,j)) and configRegistry['interfaces/eth%s_%s/type' % (i,j) ] == 'dhcp':	63	if configRegistry.has_key('interfaces/eth%s_%s/type' % (i,j)) and configRegistry['interfaces/eth%s_%s/type' % (i,j) ] == 'dhcp':
56	if configRegistry.get('interfaces/eth%s_%s/networkmanager' % ( i, j ), 'yes' ).lower() in ( 'no', 'false', '0' ):	64	if configRegistry.get('interfaces/eth%s_%s/networkmanager' % ( i, j ), 'yes' ).lower() in ( 'no', 'false', '0' ):