Changeset 149 in MondoRescue for trunk/mondo/mondo/common

Timestamp:

Dec 3, 2005, 11:38:14 PM (18 years ago)

Author:

bcornec

Message:

merge -r144:148 $SVN_M/branches/2.05

Location:

trunk/mondo/mondo/common

Files:

• libmondo-files.c (modified) (5 diffs)
• libmondo-tools.c (modified) (4 diffs)
• my-stuff.h (modified) (1 diff)

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

@@ -1192 +1192 @@
     char nfs_mount[MAX_STR_LEN];
     char nfs_client_ipaddr[MAX_STR_LEN];
+    char nfs_client_netmask[MAX_STR_LEN];
+    char nfs_client_defgw[MAX_STR_LEN];
     char nfs_server_ipaddr[MAX_STR_LEN];
     char tmp[MAX_STR_LEN];
@@ -1219 +1221 @@
     strcpy(nfs_client_ipaddr,
            call_program_and_get_last_line_of_output(command));
+    sprintf(command,
+            "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f9 | cut -d':' -f2");
+    strcpy(nfs_client_netmask,
+           call_program_and_get_last_line_of_output(command));
+    sprintf(command,
+            "route | egrep '^default' | awk '{printf $2}'");
+    strcpy(nfs_client_defgw,
+           call_program_and_get_last_line_of_output(command));
     sprintf(tmp,
             "nfs_client_ipaddr=%s; nfs_server_ipaddr=%s; nfs_mount=%s",
@@ -1233 +1243 @@
     }
     fprintf(fout, "ifconfig lo 127.0.0.1  # config loopback\n");
-    fprintf(fout, "ifconfig %s %s   # config client\n", nfs_dev,
-            nfs_client_ipaddr);
+    fprintf(fout, "ifconfig %s %s netmask %s    # config client\n", nfs_dev,
+            nfs_client_ipaddr, nfs_client_netmask);
+    fprintf(fout, "route add default gw %s  # default route\n", nfs_client_defgw);
     fprintf(fout, "ping -c 1 %s # ping server\n", nfs_server_ipaddr);
     fprintf(fout, "mount -t nfs -o nolock %s /tmp/isodir\n",
@@ -1253 +1264 @@
     sprintf(tmp, "%s/NFS-CLIENT-IPADDR", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_client_ipaddr);
+    sprintf(tmp, "%s/NFS-CLIENT-NETMASK", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, nfs_client_netmask);
+    sprintf(tmp, "%s/NFS-CLIENT-DEFGW", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, nfs_client_defgw);
     sprintf(tmp, "%s/NFS-SERVER-IPADDR", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_server_ipaddr);
@@ -1259 +1274 @@
     sprintf(tmp, "%s/NFS-SERVER-PATH", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, bkpinfo->nfs_remote_dir);
+    sprintf(tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, bkpinfo->prefix);
     log_it("Finished storing NFS configuration");
 }

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

@@ -607 +607 @@
         log_it("isodir: %s", iso_path);
         paranoid_free(iso_path);
-
+        asprintf(&tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
+        write_one_liner_data_file(tmp, bkpinfo->prefix);
+        log_it("iso-prefix: %s",  bkpinfo->prefix);
+        paranoid_free(tmp);
 /* End patch */
     }                           // end of iso code
@@ -743 +746 @@
         strcpy(bkpinfo->isodir, "/root/images/mondo");
     }
-    strcpy(bkpinfo->prefix, "mondorescue");
+    strcpy(bkpinfo->prefix, STD_PREFIX);
 
     bkpinfo->scratchdir[0] = '\0';
@@ -1041 +1044 @@
         return (0);
     } else {
-        asprintf(&command, "cat %s | grep \"%s .*\" | cut -d' ' -f2,3,4,5",
-                 config_file, label);
+        asprintf(&command, "grep '%s .*' %s| cut -d' ' -f2,3,4,5",
+                label, config_file);
         strcpy(value, call_program_and_get_last_line_of_output(command));
         paranoid_free(command);
@@ -1275 +1278 @@
              ("mktemp -q /tmp/mojo-jojo.blah.XXXXXX"));
     if (does_file_exist(config_file)) {
-        asprintf(&command, "cat %s | grep -vx \"%s .*\" > %s", config_file,
-                 label, tempfile);
+        asprintf(&command, "grep -vx '%s .*' %s > %s",
+                label, config_file, tempfile);
         paranoid_system(command);
         paranoid_free(command);

trunk/mondo/mondo/common/my-stuff.h

@@ -80 +80 @@
 
 #define IA64_BOOT_SIZE "8192"   /* Should be coherent with mindi */
+#define STD_PREFIX "mondorescue"    /* Should be coherent with mindi */
 
 /**