Changeset 620 in MondoRescue

Timestamp:

Jun 3, 2006, 7:29:07 AM (19 years ago)

Author:

andree

Message:

Fixed parsing of DHCP information in start-nfs script.

Location:

branches

Files:

• 2.0.8/mondo/mondo/common/libmondo-files.c (modified) (1 diff)
• stable/mondo/mondo/common/libmondo-files.c (modified) (1 diff)

branches/2.0.8/mondo/mondo/common/libmondo-files.c

@@ -1288 +1288 @@
     fprintf(fout, "    echo $i | grep -qi ipconf= && ipconf=`echo $i | cut -d= -f2`\n");
     fprintf(fout, "done\n");
-    fprintf(fout, "grep -q \"dhcp\" \"$ipconf\"\n");
+    fprintf(fout, "echo \"$ipconf\" | grep -q \"dhcp\"\n");
     fprintf(fout, "if [ $? = 0 ]; then\n");
-    fprintf(fout, "    ipdev=`echo $ipconf | cut -d: -f1`\n");
+    fprintf(fout, "    ipdev=`echo $ipconf | cut -d: -f2`\n");
     fprintf(fout, "    udhcpc -i $ipdev\n");
     fprintf(fout, "else\n");

branches/stable/mondo/mondo/common/libmondo-files.c

@@ -1288 +1288 @@
     fprintf(fout, "    echo $i | grep -qi ipconf= && ipconf=`echo $i | cut -d= -f2`\n");
     fprintf(fout, "done\n");
-    fprintf(fout, "grep -q \"dhcp\" \"$ipconf\"\n");
+    fprintf(fout, "echo \"$ipconf\" | grep -q \"dhcp\"\n");
     fprintf(fout, "if [ $? = 0 ]; then\n");
-    fprintf(fout, "    ipdev=`echo $ipconf | cut -d: -f1`\n");
+    fprintf(fout, "    ipdev=`echo $ipconf | cut -d: -f2`\n");
     fprintf(fout, "    udhcpc -i $ipdev\n");
     fprintf(fout, "else\n");