Changeset 149 in MondoRescue for trunk/mondo/mondo

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

Files:

• common/libmondo-files.c (modified) (5 diffs)
• common/libmondo-tools.c (modified) (4 diffs)
• common/my-stuff.h (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (3 diffs)

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 */
 
 /**

trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

@@ -737 +737 @@
         }
 #ifdef __FreeBSD__
-        sprintf(mount_cmd, "/mnt/isodir/%s/%s/%d.iso", bkpinfo->isodir,
-                bkpinfo->nfs_remote_dir, g_current_media_number);
+        sprintf(mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir,
+                bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number);
         mddev = make_vn(mount_cmd);
         sprintf(mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
 #else
-        sprintf(mount_cmd, "mount %s/%s/%d.iso -t iso9660 -o loop,ro %s",
+        sprintf(mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s",
                 bkpinfo->isodir, bkpinfo->nfs_remote_dir,
-                g_current_media_number, MNT_CDROM);
+                bkpinfo->prefix, g_current_media_number, MNT_CDROM);
 #endif
 
     } else if (bkpinfo->backup_media_type == iso) {
 #ifdef __FreeBSD__
-        sprintf(mount_cmd, "%s/%d.iso", bkpinfo->isodir,
-                g_current_media_number);
+        sprintf(mount_cmd, "%s/%s-%d.iso", bkpinfo->isodir,
+                bkpinfo->prefix, g_current_media_number);
         mddev = make_vn(mount_cmd);
         sprintf(mount_cmd, "mount_cd9660 -r %s %s", mddev, MNT_CDROM);
 #else
-        sprintf(mount_cmd, "mount %s/%d.iso -t iso9660 -o loop,ro %s",
-                bkpinfo->isodir, g_current_media_number, MNT_CDROM);
+        sprintf(mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s",
+                bkpinfo->isodir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
 #endif
     } else if (strstr(bkpinfo->media_device, "/dev/"))
@@ -1035 +1035 @@
                 } else {
                     bkpinfo->backup_media_type = iso;
+                    if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
+                            strcpy(bkpinfo->prefix,value);
+                    } else {
+                            strcpy(bkpinfo->prefix,STD_PREFIX);
+                    }
                 }
             }
         } else if (!strcmp(value, "nfs")) {
             bkpinfo->backup_media_type = nfs;
+            if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
+                    strcpy(bkpinfo->prefix,value);
+            } else {
+                    strcpy(bkpinfo->prefix,STD_PREFIX);
+            }
         } else if (!strcmp(value, "tape")) {
             bkpinfo->backup_media_type = tape;
@@ -1201 +1211 @@
                 }
             }
-            /* bkpinfo->isodir should now be the true path to 1.iso etc... */
+            /* bkpinfo->isodir should now be the true path to prefix-1.iso etc... */
             if (bkpinfo->backup_media_type == iso) {
                 sprintf(bkpinfo->isodir, "%s%s", iso_mnt, iso_path);