Changeset 1639 in MondoRescue for branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

Sep 20, 2007, 10:20:45 PM (17 years ago)

Author:

Bruno Cornec

Message:

More conf file items handled

File:

• branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (2 diffs)

branches/stable/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -2048 +2048 @@
  * @return 0 for success, nonzero for failure.
  */
-int extract_cfg_file_and_mountlist_from_tape_dev(char *dev)
+int extract_cfg_file_and_mountlist_from_tape_dev(struct s_bkpinfo  *bkpinfo)
 {
     char *command = NULL;
     int res = 0;
     // BERLIOS: below 32KB seems to block at least on RHAS 2.1 and MDK 10.0
-    long tape_block_size = 32768;
 
     // tar -zxvf-
     mr_asprintf(&command,
             "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx %s %s %s %s %s",
-            dev,
-            tape_block_size,
-            1024L * 1024 * 32 / tape_block_size,
+            bkpinfo->media_device,
+            bkpinfo->internal_tape_block_size,
+            1024L * 1024 * 32 / bkpinfo->internal_tape_block_size,
             MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB,
             BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, "tmp/i-want-my-lvm");
@@ -2148 +2147 @@
                         bkpinfo->media_device);
             }
+            /* extract_cfg_file_and_mountlist_from_tape_dev needs 
+             * the internal block size to be setup */
+            if (bkpinfo->internal_tape_blocksize == 0) {
+                /* Guessing a value */
+                bkpinfo->internal_tape_blocksize = 32768;
+            }
             mr_asprintf(&tmp, bkpinfo->media_device);
             if (extract_cfg_file_and_mountlist_from_tape_dev
-                (bkpinfo->media_device)) {
+                (bkpinfo)) {
                 mr_allocstr(bkpinfo->media_device, "/dev/st0");
                 if (extract_cfg_file_and_mountlist_from_tape_dev
-                    (bkpinfo->media_device)) {
+                    (bkpinfo)) {
                     mr_allocstr(bkpinfo->media_device, "/dev/osst0");
                     if (extract_cfg_file_and_mountlist_from_tape_dev
-                        (bkpinfo->media_device)) {
+                        (bkpinfo)) {
                         mr_allocstr(bkpinfo->media_device, "/dev/ht0");
                         if (extract_cfg_file_and_mountlist_from_tape_dev
-                            (bkpinfo->media_device)) {
+                            (bkpinfo)) {
                             mr_msg(3,
                                     "I tried lots of devices but none worked.");