X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=conf_files%2Fpl_validateconf;h=b3a56ecca0add428087b458b4fb150dc8c90a351;hb=refs%2Fheads%2Fplanetlab-3_3-branch;hp=1b9d183b3e5334ae28271a5f1b9d8e11aedb088a;hpb=8a6a03a22cb502d670e44f14ad28ee1afe74f08f;p=bootcd.git

diff --git a/conf_files/pl_validateconf b/conf_files/pl_validateconf
index 1b9d183..b3a56ec 100644
--- a/conf_files/pl_validateconf
+++ b/conf_files/pl_validateconf
@@ -3,7 +3,7 @@
 # Valid environment variables to appear in a planetlab config file
 TAGS='IP_METHOD HOST_NAME DOMAIN_NAME PROXY_SERVER
       IP_ADDRESS IP_GATEWAY IP_NETMASK IP_NETADDR IP_BROADCASTADDR 
-      IP_DNS1 IP_DNS2 PRIMARY_DEV PRIMARY_MAC'
+      IP_DNS1 IP_DNS2 NET_DEVICE NODE_KEY NODE_ID'
 
 # Valid characters that variable can be set to
 CHARS='[:alnum:]\.: _-'
@@ -19,4 +19,4 @@ do
         REGEX="$REGEX|^$t"
     fi
 done
-/bin/egrep "($REGEX)\=\\\"[$CHARS]*\\\"\s*$"
+/usr/bin/dos2unix | /bin/egrep "($REGEX)\=\\\"[$CHARS]*\\\"\s*$"