Changeset 149 in MondoRescue for trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

Timestamp:

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

Author:

bcornec

Message:

merge -r144:148 $SVN_M/branches/2.05

File:

• trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c (modified) (3 diffs)

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