Changeset 618 in MondoRescue for trunk/mondo/mondo

Timestamp:

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

Author:

bcornec

Message:

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

Location:

trunk/mondo/mondo

Files:

• common/libmondo-files.c (modified) (2 diffs)
• mondoarchive/mondo-cli.c (modified) (3 diffs)
• mondorestore/mondo-restore.c (modified) (1 diff)

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");

trunk/mondo/mondo/mondoarchive/mondo-cli.c

@@ -219 +219 @@
     char *tmp1;
     char *psz;
+    char *p;
+    char *q;
 
     long itbs;
@@ -302 +304 @@
         }
         asprintf(&tmp1, flag_val['I']);
-        char *p = tmp1;
-        char *q = tmp1;
+        p = tmp1;
+        q = tmp1;
 
         /* Cut the flag_val['I'] in parts containing all paths to test them */
@@ -538 +540 @@
         }
         asprintf(&tmp1, flag_val['E']);
-        char *p = tmp1;
-        char *q = tmp1;
+        p = tmp1;
+        q = tmp1;
 
         /* Cut the flag_val['E'] in parts containing all paths to test them */

trunk/mondo/mondo/mondorestore/mondo-restore.c

@@ -3160 +3160 @@
             "to the Mondo mailing list when you are seeking technical    ");
     log_msg(0,
-            "support. Without it, we can't help you.               - Hugo");
+            "support. Without it, we can't help you.            - DevTeam");
     log_msg(0,
             "------------------------------------------------------------");