Merge disconnected ops branch.

[bootcd.git] / conf_files / pl_validateconf

diff --git a/conf_files/pl_validateconf b/conf_files/pl_validateconf
index 1b9d183..f0f0370 100644 (file)
--- a/conf_files/pl_validateconf
+++ b/conf_files/pl_validateconf
@@ -3,7 +3,8 @@
 # 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
+      IPMI_ADDRESS IPMI_MAC DISCONNECTED_OPERATION'
 
 # Valid characters that variable can be set to
 CHARS='[:alnum:]\.: _-'
@@ -19,4 +20,4 @@ do
         REGEX="$REGEX|^$t"
     fi
 done
-/bin/egrep "($REGEX)\=\\\"[$CHARS]*\\\"\s*$"
+/usr/bin/dos2unix | /bin/egrep "($REGEX)\=\\\"[$CHARS]*\\\"\s*$"