Changeset 649 in MondoRescue for trunk/mondo/mondo

Timestamp:

Jun 8, 2006, 11:31:13 AM (18 years ago)

Author:

bcornec

Message:

merge -r617:641 $SVN_M/branches/stable

Location:

trunk/mondo/mondo

Files:

• autorun (modified) (1 prop)
• common/libmondo-files.c (modified) (1 diff)
• mondoarchive/mondo-cli.c (modified) (2 diffs)

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

@@ -1158 +1158 @@
     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, "    udhcpc -i $ipdev\n", );
+    fprintf(fout, "    udhcpc -i $ipdev\n");
     fprintf(fout, "else\n");
     fprintf(fout, "    if [ \"$ipconf\" != \"\" ]; then\n");

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

@@ -312 +312 @@
             if (q != NULL) {
                 *q = '\0';
-                p = q+1 ;
                 if (stat(p, &buf) != 0) {
                     log_msg(1, "ERROR ! %s doesn't exist", p);
                     fatal_error("ERROR ! You specified a directory to include which doesn't exist");
                 }
+                p = q+1 ;
             } else {
                 if (stat(p, &buf) != 0) {
@@ -548 +548 @@
             if (q != NULL) {
                 *q = '\0';
-                p = q+1 ;
                 if (stat(p, &buf) != 0) {
                     log_msg(1, "WARNING ! %s doesn't exist", p);
                 }
+                p = q+1 ;
             } else {
                 if (stat(p, &buf) != 0) {