Changeset 618 in MondoRescue for trunk/mondo/mondo/common/libmondo-files.c

Timestamp:

Jun 3, 2006, 12:16:18 AM (18 years ago)

Author:

bcornec

Message:

merge -r 591:617 $SVN_M/branches/stable

File:

• trunk/mondo/mondo/common/libmondo-files.c (modified) (2 diffs)

trunk/mondo/mondo/common/libmondo-files.c

@@ -1149 +1149 @@
     fprintf(fout, "done\n");
     fprintf(fout, "ifconfig lo 127.0.0.1  # config loopback\n");
+    fprintf(fout, "ipdev=%s\n", nfs_dev);
     fprintf(fout, "ipaddress=%s\n", nfs_client_ipaddr);
     fprintf(fout, "ipnetmask=%s\n", nfs_client_netmask);
@@ -1157 +1158 @@
     fprintf(fout, "    echo $i | grep -qi ipconf= && ipconf=`echo $i | cut -d= -f2`\n");
     fprintf(fout, "done\n");
-    fprintf(fout, "if [ \"$ipconf\" = \"dhcp\" ]; then\n");
-    fprintf(fout, "    udhcpc -i %s\n", nfs_dev);
+    fprintf(fout, "grep -q \"dhcp\" \"$ipconf\"\n");
+    fprintf(fout, "if [ $? = 0 ]; then\n");
+    fprintf(fout, "    ipdev=`echo $ipconf | cut -d: -f1`\n");
+    fprintf(fout, "    udhcpc -i $ipdev\n", );
     fprintf(fout, "else\n");
     fprintf(fout, "    if [ \"$ipconf\" != \"\" ]; then\n");
-    fprintf(fout, "        ipaddress=`echo $ipconf | cut -d: -f1`\n");
-    fprintf(fout, "        ipnetmask=`echo $ipconf | cut -d: -f2`\n");
-    fprintf(fout, "        ipbroadcast=`echo $ipconf | cut -d: -f3`\n");
-    fprintf(fout, "        ipgateway=`echo $ipconf | cut -d: -f4`\n");
+    fprintf(fout, "        ipdev=`echo $ipconf | cut -d: -f1`\n");
+    fprintf(fout, "        ipaddress=`echo $ipconf | cut -d: -f2`\n");
+    fprintf(fout, "        ipnetmask=`echo $ipconf | cut -d: -f3`\n");
+    fprintf(fout, "        ipbroadcast=`echo $ipconf | cut -d: -f4`\n");
+    fprintf(fout, "        ipgateway=`echo $ipconf | cut -d: -f5`\n");
     fprintf(fout, "    fi\n");
-    fprintf(fout, "    ifconfig %s $ipaddress netmask $ipnetmask broadcast $ipbroadcast\n", nfs_dev);
+    fprintf(fout, "    ifconfig $ipdev $ipaddress netmask $ipnetmask broadcast $ipbroadcast\n");
     fprintf(fout, "    route add default gw $ipgateway\n");
     fprintf(fout, "fi\n");