Index: debian/univention-config-registry.univention-config-registry-variables =================================================================== --- debian/univention-config-registry.univention-config-registry-variables (Revision 13568) +++ debian/univention-config-registry.univention-config-registry-variables (Arbeitskopie) @@ -88,6 +88,12 @@ Type=str Categories=system-network +[ipv6/gateway] +Description[de]=Standard-IPv6-Gateway +Description[en]=Default IPv6-gateway +Type=str +Categories=system-network + [hostname] Description[de]=Name des Rechners Description[en]=Name of the computer @@ -148,6 +154,18 @@ Type=str Categories=system-network +[interfaces/eth.*/ipv6/address] +Description[de]=IPv6-Adresse des Netz-Interfaces +Description[en]=IPv6 address of the network interface +Type=str +Categories=system-network + +[interfaces/eth.*/ipv6/netmask] +Description[de]=IPv6-Netzwerkmaske des Netz-Interfaces +Description[en]=IPv6 netmask of the network interface +Type=str +Categories=system-network + [hosts/static/.*] Description[de]=Zusätzliche /etc/hosts Einträge Description[en]=Additional entries for /etc/hosts Index: debian/changelog =================================================================== --- debian/changelog (Revision 13568) +++ debian/changelog (Arbeitskopie) @@ -1,3 +1,43 @@ +univention-config-registry (5.1.4-1) unstable; urgency=low + + * merged version (Bug #15438) + + -- Kai-Wilhelm Bolte 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 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 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 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 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 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 Index: debian/univention-config-registry.univention-config-registry =================================================================== --- debian/univention-config-registry.univention-config-registry (Revision 13568) +++ debian/univention-config-registry.univention-config-registry (Arbeitskopie) @@ -101,11 +101,14 @@ Postinst: interfaces.py Variables: interfaces/eth.* Variables: gateway +Variables: ipv6/gateway Type: multifile Multifile: etc/hosts Variables: interfaces/eth0/type Variables: interfaces/eth.*/address +Variables: interfaces/eth.*/ipv6/address +Variables: interfaces/eth.*/ipv6/netmask Variables: interfaces/eth.*/hosts Variables: hostname Variables: domainname @@ -115,6 +118,8 @@ Multifile: etc/hosts Subfile: etc/hosts.d/00-base Variables: interfaces/eth.*/address +Variables: interfaces/eth.*/ipv6/address +Variables: interfaces/eth.*/ipv6/netmask Variables: interfaces/eth.*/type Variables: interfaces/eth.*/hosts Variables: hostname Index: conffiles/network/interfaces =================================================================== --- conffiles/network/interfaces (Revision 13568) +++ conffiles/network/interfaces (Arbeitskopie) @@ -38,19 +38,27 @@ 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] + print ' address '+configRegistry['interfaces/eth%s/address' % i] if configRegistry['interfaces/eth%s/network' % i]: - print 'network '+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] + print ' netmask '+configRegistry['interfaces/eth%s/netmask' % i] if configRegistry['interfaces/eth%s/broadcast' % i]: - print 'broadcast '+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' ):