X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=conf_files%2Fpl_netinit;h=b5851b5fd2dca05fefc9fcd2041c25cd71a8e53f;hb=refs%2Fheads%2Fcluster;hp=b3934f67721c6976c0bd4922368fc7a1a73c1a95;hpb=5b62904b9c9dda72ca6fe82be9afcba0647d81b3;p=bootcd.git

diff --git a/conf_files/pl_netinit b/conf_files/pl_netinit
index b3934f6..b5851b5 100644
--- a/conf_files/pl_netinit
+++ b/conf_files/pl_netinit
@@ -208,7 +208,12 @@ find_node_config()
 	return 1
     fi
 
-    return 0
+    echo "pl_netinit: using default network configuration from initrd"
+    echo 'IP_METHOD="dhcp"' > $USED_NET_CONF
+    echo 'HOST_NAME="planetlabnode"' >> $USED_NET_CONF
+    echo 'DOMAIN_NAME="localhost"' >> $USED_NET_CONF
+    DEFAULT_NET_CONF=1
+    return 1
 }
 
 
@@ -297,8 +302,11 @@ if [[ "$IP_METHOD" == "dhcp" ]]; then
 
     # setup a dhclient conf file for this device (used to send
     # our hostname to the dhcp server)
-    echo "interface \"$ETH_DEVICE\" {" > $DHCLIENT_CONF_FILE
+    echo "# generated by pl_netinit" > $DHCLIENT_CONF_FILE
+    echo "option planetlab-nfs-cluster-server code 200 = ip-address;" >> $DHCLIENT_CONF_FILE
+    echo "interface \"$ETH_DEVICE\" {" >> $DHCLIENT_CONF_FILE
     echo "send host-name \"$HOST_NAME.$DOMAIN_NAME\";" >> $DHCLIENT_CONF_FILE
+    echo "request subnet-mask,broadcast-address,domain-name,host-name,routers,domain-name-servers,planetlab-nfs-cluster-server;" >> $DHCLIENT_CONF_FILE
     echo "}" >> $DHCLIENT_CONF_FILE
 
     # touch the redhat net device configuration file so