CVS: sidai/net-config hosts.tmpl, 1.17, 1.18 ifcfg-eth0.tmpl, 1.14, 1.15 network.tmpl, 1.12, 1.13 nsswitch.conf.tmpl, 1.8, 1.9

[Will P. <pa...@us...>]

Update of /cvsroot/ark/sidai/net-config
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv305/net-config

Modified Files:
	hosts.tmpl ifcfg-eth0.tmpl network.tmpl nsswitch.conf.tmpl 
Log Message:
updates

Index: hosts.tmpl
===================================================================
RCS file: /cvsroot/ark/sidai/net-config/hosts.tmpl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** hosts.tmpl	26 May 2004 18:40:26 -0000	1.17
--- hosts.tmpl	9 Apr 2007 13:17:18 -0000	1.18
***************
*** 45,48 ****
--- 45,52 ----
     ret['destname'] = 'etc/inet/hosts'
  
+ special_localhost_names = ''
+ if env.has_key('special_localhost_names'):
+    special_localhost_names = ' '+env['special_localhost_names']
+ 
  minimal_hosts_table = 0 # maximal, then
  if env.has_key('minimal_hosts_table'):
***************
*** 52,56 ****
  # *** Autogenerated file! Edits will be lost!! ***
  #
! 127.0.0.1	localhost localhost.localdomain loopback
  <%
  if env.has_key('important_external_hosts_table'):
--- 56,60 ----
  # *** Autogenerated file! Edits will be lost!! ***
  #
! 127.0.0.1	localhost localhost.localdomain loopback<%= special_localhost_names =%>
  <%
  if env.has_key('important_external_hosts_table'):

Index: ifcfg-eth0.tmpl
===================================================================
RCS file: /cvsroot/ark/sidai/net-config/ifcfg-eth0.tmpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** ifcfg-eth0.tmpl	18 Apr 2005 09:27:00 -0000	1.14
--- ifcfg-eth0.tmpl	9 Apr 2007 13:17:19 -0000	1.15
***************
*** 72,86 ****
  else:
      ipaddr    = iface['ip-address']
      netmask   = iface['netmask']
!     network   = iface['network']
      broadcast = iface['broadcast']
  
      print """DEVICE=%(IFACE_NAME)s
! BOOTPROTO=static
  BROADCAST=%(broadcast)s
  IPADDR=%(ipaddr)s
! NETMASK=%(netmask)s
! NETWORK=%(network)s
! ONBOOT=yes
! TYPE=Ethernet""" % vars()
  %>
--- 72,91 ----
  else:
      ipaddr    = iface['ip-address']
+     hwaddr    = iface['mac-address']
      netmask   = iface['netmask']
!     gateway   = iface['gateway']
      broadcast = iface['broadcast']
  
      print """DEVICE=%(IFACE_NAME)s
! BOOTPROTO=none
! HWADDR=%(hwaddr)s
! ONBOOT=yes
! NETMASK=%(netmask)s
  BROADCAST=%(broadcast)s
  IPADDR=%(ipaddr)s
! USERCTL=no
! PEERING=yes
! GATEWAY=%(gateway)s
! TYPE=Ethernet
! IPV6INIT=no""" % vars()
  %>

Index: network.tmpl
===================================================================
RCS file: /cvsroot/ark/sidai/net-config/network.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** network.tmpl	26 May 2004 18:40:26 -0000	1.12
--- network.tmpl	9 Apr 2007 13:17:19 -0000	1.13
***************
*** 68,71 ****
--- 68,72 ----
  if info_src == 'dhcp':
      print """NETWORKING=yes
+ NETWORKING_IPV6=no
  HOSTNAME=%(hostn)s""" % vars()
  

Index: nsswitch.conf.tmpl
===================================================================
RCS file: /cvsroot/ark/sidai/net-config/nsswitch.conf.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** nsswitch.conf.tmpl	26 May 2004 18:40:26 -0000	1.8
--- nsswitch.conf.tmpl	9 Apr 2007 13:17:19 -0000	1.9
***************
*** 47,51 ****
  # /etc/nsswitch.conf: Autogenerated file! Edits will be lost!!
  #
! # Modeled on /etc/nsswitch.files from Solaris, with additions
  # from Linux land.
  #
--- 47,51 ----
  # /etc/nsswitch.conf: Autogenerated file! Edits will be lost!!
  #
! # Modeled on /etc/nsswitch.dns from Solaris, with additions
  # from Linux land.
  #
***************
*** 89,101 ****
  group:      files
  
! hosts:      files[NOTFOUND=continue UNAVAIL=return] dns
! ipnodes:    files
! # (a solaris8 thing)
! # Uncomment the following line and comment out the above to resolve
! # both IPv4 and IPv6 addresses from the ipnodes databases. Note that
! # IPv4 addresses are searched in all of the ipnodes databases before
! # searching the hosts databases. Before turning this option on, consult
! # the Network Administration Guide for more details on using IPv6.
! #ipnodes:   files dns
  
  aliases:    files
--- 89,97 ----
  group:      files
  
! hosts:      files dns
! # Solaris:
! # Note that IPv4 addresses are searched for in all of the ipnodes databases
! # before searching the hosts databases.
! ipnodes:    files dns
  
  aliases:    files