X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=dns-config;h=e03b4a9ac34fde4822e037cfaeba7c88c66b6af9;hb=283ff186feca8629684ddf62666a994d39ba45d6;hp=bc2bf46518cee8e72f802676f7cac6a97bf9006e;hpb=da08eb5915135af95298b8fde31d49f57c70eaf7;p=myplc.git

diff --git a/dns-config b/dns-config
index bc2bf46..e03b4a9 100755
--- a/dns-config
+++ b/dns-config
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env /usr/bin/plcsh
 #
 # Writes IP addresses and hostnames of PlanetLab nodes to
 # /etc/plc_hosts. Useful for dnsmasq, specify "addn-hosts
@@ -7,11 +7,9 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: api-config,v 1.10 2006/05/24 03:08:55 mlhuang Exp $
+# $Id$
 #
 
-import plcapilib
-(plcapi, moreopts, argv) = plcapilib.plcapi(globals())
 from plc_config import PLCConfiguration
 import os, sys
 
@@ -53,27 +51,33 @@ def main():
 
     # Get the primary IP address for each node
     hosts = {}
-    nodes = AdmGetNodes([], ['node_id', 'hostname'])
-    plcapi.begin()
-    for node in nodes:
-        AdmGetAllNodeNetworks(node['node_id'])
-    nodenetworks_list = plcapi.commit()
-    if nodenetworks_list is not None:
-        for i, nodenetworks in enumerate(nodenetworks_list):
-            for nodenetwork in nodenetworks:
-                if nodenetwork['hostname']:
-                    hostname = nodenetwork['hostname']
-                else:
-                    hostname = nodes[i]['hostname']
-        
-                if hosts.has_key(nodenetwork['ip']):
-                    if hostname not in hosts[nodenetwork['ip']]:
-                        hosts[nodenetwork['ip']].append(hostname)
-                else:
-                    hosts[nodenetwork['ip']] = [hostname]
+
+    nodes = {}
+    for node in GetNodes():
+        nodes[node['node_id']] = node
+
+    nodenetwork_ids = set()
+    for node in nodes.values():
+        nodenetwork_ids.update(node['nodenetwork_ids'])
+
+    for nodenetwork in GetNodeNetworks(list(nodenetwork_ids)):
+        if not nodenetwork['ip']:
+            continue
+
+        if nodenetwork['hostname']:
+            hostname = nodenetwork['hostname']
+        else:
+            hostname = nodes[nodenetwork['node_id']]['hostname']
+
+        if hosts.has_key(nodenetwork['ip']):
+            if hostname not in hosts[nodenetwork['ip']]:
+                hosts[nodenetwork['ip']].append(hostname)
+        else:
+            hosts[nodenetwork['ip']] = [hostname]
     
     # Write /etc/plc_hosts
     plc_hosts = open("/etc/plc_hosts", "w")
+    plc_hosts.write("# DO NOT EDIT; File is writen and removed by automatic scripts\n")
     for ip, hostnames in hosts.iteritems():
         plc_hosts.write(ip + "\t" + " ".join(hostnames) + "\n")
     plc_hosts.close()
@@ -89,6 +93,7 @@ def main():
 domain-needed
 bogus-priv
 addn-hosts=/etc/plc_hosts
+resolv-file=/etc/resolv.conf
 """.lstrip())
 
     # Reload dnsmasq