Changeset 1948 in MondoRescue for branches/2.2.6/mondo

Timestamp:

May 26, 2008, 5:35:44 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Adds OBDR support (use_obdr field in bkpinfo added, -o option changed to mean OBDR - LILO not usable anyway as a bootloader for ISO images)

Location:

branches/2.2.6/mondo/src

Files:

• common/libmondo-archive.c (modified) (1 diff)
• common/libmondo-cli.c (modified) (1 diff)
• common/libmondo-stream.c (modified) (5 diffs)
• common/mondostructures.h (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (1 diff)

branches/2.2.6/mondo/src/common/libmondo-archive.c

@@ -847 +847 @@
         if (write_one_liner_data_file(tmp1, "TRUE")) {
             log_msg(1, "%ld: Unable to write one-liner ACL",
+                __LINE__);
+        }
+        paranoid_free(tmp1);
+    }
+    if (bkpinfo->use_obdr) {
+        asprintf(&tmp1, "%s/OBDR", bkpinfo->tmpdir);
+        if (write_one_liner_data_file(tmp1, "TRUE")) {
+            log_msg(1, "%ld: Unable to write one-liner OBDR",
                 __LINE__);
         }

branches/2.2.6/mondo/src/common/libmondo-cli.c

@@ -934 +934 @@
     }
 
-    if (!flag_set['o']
-        &&
-        !run_program_and_log_output
-        ("grep -Ei suse /etc/issue.net | grep -E '9.0' | grep 64", 2)) {
+    bkpinfo->use_obdr = FALSE;
+    if (flag_set['o']) {
+        if (!flag_set['t']) {
+            log_to_screen("OBDR support is only available for tapes. Use the -t option");
+            fatal_error("Aborting");
+        }
+        bkpinfo->use_obdr = TRUE;
+    }
+#ifndef __FreeBSD__
+    if (!is_this_a_valid_disk_format("vfat")) {
         bkpinfo->make_cd_use_lilo = TRUE;
         log_to_screen
-            ("Forcing you to use LILO. SuSE 9.0 (64-bit) has a broken mkfs.vfat binary.");
-    }
-    if (flag_set['o']) {
+            ("Your kernel appears not to support vfat filesystems. I am therefore");
+        log_to_screen
+            ("using LILO instead of SYSLINUX as the media boot loader.");
+    }
+    if (run_program_and_log_output("which mkfs.vfat", 2)) {
         bkpinfo->make_cd_use_lilo = TRUE;
-    }
-#ifndef __FreeBSD__
-    else {
-        if (!is_this_a_valid_disk_format("vfat")) {
-            bkpinfo->make_cd_use_lilo = TRUE;
-            log_to_screen
-                ("Your kernel appears not to support vfat filesystems. I am therefore");
-            log_to_screen
-                ("using LILO instead of SYSLINUX as the media boot loader.");
-        }
-        if (run_program_and_log_output("which mkfs.vfat", 2)) {
-            bkpinfo->make_cd_use_lilo = TRUE;
 #ifdef __IA32__
-            log_to_screen
-                ("Your filesystem is missing 'mkfs.vfat', so I cannot use SYSLINUX as");
-            log_to_screen
-                ("your boot loader. I shall therefore use LILO instead.");
+        log_to_screen
+            ("Your filesystem is missing 'mkfs.vfat', so I cannot use SYSLINUX as");
+        log_to_screen
+            ("your boot loader. I shall therefore use LILO instead.");
 #endif
 #ifdef __IA64__
-            log_to_screen
-                ("Your filesystem is missing 'mkfs.vfat', so I cannot prepare the EFI");
-            log_to_screen("environment correctly. Please install it.");
-            fatal_error("Aborting");
+        log_to_screen
+            ("Your filesystem is missing 'mkfs.vfat', so I cannot prepare the EFI");
+        log_to_screen("environment correctly. Please install it.");
+        fatal_error("Aborting");
 #endif
-        }
+    }
 #ifdef __IA64__
-        /* We force ELILO usage on IA64 */
-        bkpinfo->make_cd_use_lilo = TRUE;
+    /* We force ELILO usage on IA64 */
+    bkpinfo->make_cd_use_lilo = TRUE;
 #endif
-    }
 #endif
 

branches/2.2.6/mondo/src/common/libmondo-stream.c

@@ -4 +4 @@
 ...tools for talking to tapes, Monitas streams, etc.
 
-
-07/10
-- added ACL and XATTR support
-
-04/17
-- added bkpinfo->internal_tape_block_size
-- fixed bug in set_tape_block_size_with_mt()
-
-03/25
-- call 'mt' when opening tape in/out, to set block size to 32K
-
-02/06/2004
-- only eject_device() at end of closein_tape() --- not closeout_tape()
-
-10/26/2003
-- call eject_device() at end of closein_tape() and closeout_tape()
- 
-09/25
-- added docu-header to each subroutine
-
-09/20
-- working on multi-tape code
-- friendlier message in insist_on_this_tape_number()
-- delay is now 5s
-
-09/10
-- adding multi-tape support
-- adding 'back catalog' of previous archives, so that we may resume
-  from point of end-of-tape (approx.)
-
-09/08
-- cleaned up insist_on_this_tape_number() --- 10s delay for same tape now
-
-08/27
-- improved find_tape_device_and_size() --- tries /dev/osst*
-
-05/05
-- added Joshua Oreman's FreeBSD patches
-
-04/24
-- added lots of assert()'s and log_OS_error()'s
-
-04/06/2003
-- use find_home_of_exe() instead of which
-
-12/13/2002
-- cdrecord -scanbus call was missing 2> /dev/null
-
-11/24
-- disabled fatal_error("Bad marker")
-
-10/29
-- replaced convoluted grep wih wc (KP)
-
-09/07
-- removed g_end_of_tape_reached
-- lots of multitape-related fixes
-
-08/01 - 08/31
-- write 16MB of zeroes to end of tape when closing(out)
-- compensate for 'buffer' and its distortion of speed of writing/reading
-  when writing/reading data disks at start of tape
-- rewrote lots of multitape stuff
-- wrote workaround to allow >2GB of archives w/buffering
-- do not close/reopen tape when starting to read/write from
-  new tape: no need! 'buffer' handles all that; we're writing
-  to/reading from a FIFO, so no need to close/reopen when new tape
-- write 8MB of zeroes at end of tape, just in case
-- re-enable various calls to *_evalcall_form
-- added g_end_of_tape_reached
-- fixed bugs in start_to_[read|write]_[to|from]_next_tape
-- added internal buffering, replacing the external 'buffer' exe
-- wait 10 seconds (after user inserts new tape), to
-  let tape stabilize in drive
-- added insist_on_this_tape_number()
-- worked on find_tape_device_and_size()
-- cleaned up some log_it() calls
-- added find_tape_device_and_size()
-- replaced using_cdstream with backup_media_type
-- replace *_from_tape with *_from_stream
-- replace *_to_stream with *_to_stream
-
-07/01 - 07/31
-- leave 32MB at end of tape, to avoid overrunning
-- started [07/24/2002]
 */
 
@@ -753 +668 @@
         return (0);
     }
+    if (bkpinfo->use_obdr) {
+        skip_obdr(tapedev);
+    }
+
     insist_on_this_tape_number(1);
     sprintf(outfname, "%s/tmp/all.tar.gz", bkpinfo->tmpdir);
@@ -864 +783 @@
 
 /**
- * Start writing to a tape device for the backup.
+ * Return the non-rewinding device when passed the normal one
+ * @param tapedev The tape device to open for writing.
+ * @note the caller needs to free the string returned
+ */
+char *get_non_rewind_dev(char *tapedev)
+{
+
+    char *ntapedev = NULL;
+    char *p = NULL;
+    char *q = NULL;
+
+    ntapedev = (char *)malloc(strlen(tapedev)+sizeof(char));
+    p = strrchr(tapedev,'/');
+    if (p == NULL) {
+        return(NULL);
+    }
+
+    /* Copy tapedev content up to the last / */
+    q = tapedev;
+    while (q != p) {
+        *ntapedev = *q;
+        ntapedev++;
+        q++;
+    }
+    /* Copy the '/' */
+    *ntapedev = *q;
+    ntapedev++;
+    q++;
+    /* Adds a 'n' - non-rewinding */
+    *ntapedev = 'n';
+    ntapedev++;
+    /* Copy the rest of tapedev */
+    while (*q != '\0') {
+        *ntapedev = *q;
+        ntapedev++;
+        q++;
+    }
+    *ntapedev = '\0';
+    if (mt_says_tape_exists(ntapedev)) {
+        log_it("Non-rewinding tape device is %s",ntapedev);
+    } else {
+        log_it("Unable to find non-rewinding tape device.");
+        ntapedev = NULL;
+    }
+    return(ntapedev);
+}
+
+
+/**
+ * Handle OBDR if we were asked to do so
  * @param tapedev The tape device to open for writing.
  * @return 0 for success, nonzero for failure.
@@ -870 +838 @@
  * EXISTING DATA on the tape!
  */
+void skip_obdr(char *tapedev)
+{
+    char *command = NULL;
+
+    ntapedev = get_non_rewind_dev(tapedev);
+    if (ntapedev == NULL) {
+        log_it("Not skipping OBDR");
+    }
+
+    asprintf(&command, "mt -f %s fsf 2", ntapedev);
+    run_program_and_log_output(command, 1);
+    paranoid_free(command);
+}
+
+int create_obdr(char *tapedev)
+{
+
+    char *ntapedev = NULL;
+    char *command = NULL;
+    int res = 0;
+
+    ntapedev = get_non_rewind_dev(tapedev);
+    if (ntapedev == NULL) {
+        log_it("Skipping OBDR");
+        return(1);
+    }
+
+    /* OBDR: First block 10 kB of zero bs = 512 */
+    asprintf(&command, "mt -f %s compression off", tapedev);
+    res = run_program_and_log_output(command, 1);
+    paranoid_free(command);
+
+    asprintf(&command, "mt -f %s rewind", tapedev);
+    res = run_program_and_log_output(command, 1);
+    paranoid_free(command);
+
+    asprintf(&command, "mt -f %s setblk 512", ntapedev);
+    res = run_program_and_log_output(command, 1);
+    paranoid_free(command);
+
+    asprintf(&command, "dd if=/dev/zero of=%s bs=512 count=20", ntapedev);
+    res = run_program_and_log_output(command, 1);
+    paranoid_free(command);
+
+    /* OBDR: then ISO boot image bs = 2048 */
+    asprintf(&command, "mt -f %s setblk 2048", ntapedev);
+    res = run_program_and_log_output(command, 1);
+    paranoid_free(command);
+
+    asprintf(&command, "dd if=%s of=%s bs=2048", ntapedev);
+    res = run_program_and_log_output(command, 1);
+    paranoid_free(command);
+
+}
+
+/**
+ * Start writing to a tape device for the backup.
+ * Handle OBDR if we were asked to do so
+ * @param tapedev The tape device to open for writing.
+ * @return 0 for success, nonzero for failure.
+ * @note This should be called ONLY from backup processes. It will OVERWRITE ANY
+ * EXISTING DATA on the tape!
+ */
 int openout_tape(char *tapedev, long internal_tape_block_size)
 {
-//  char sz_call_to_buffer[MAX_STR_LEN];
 
     g_current_media_number = 1;
@@ -884 +914 @@
     g_tapecatalog->entries = 0;
     g_tape_posK = 0;
+
+    if (bkpindo->use_obdr) {
+        create_obdr(tapedev);
+    }
 
     set_tape_block_size_with_mt(tapedev, internal_tape_block_size);

branches/2.2.6/mondo/src/common/mondostructures.h

@@ -606 +606 @@
    */
     bool make_cd_use_lilo;
+
+  /**
+   * If TRUE, make the the tape bootable. If FALSE, normal tape, the default
+   */
+    bool use_obdr;
 };
 

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

@@ -1041 +1041 @@
 read_cfg_var(cfg_file, "use-star", value);
 if (strstr(value, "yes")) {
-bkpinfo->use_star = TRUE;
-log_msg(1, "Goody! ... bkpinfo->use_star is now true.");
+    bkpinfo->use_star = TRUE;
+    log_msg(1, "Goody! ... bkpinfo->use_star is now true.");
+}
+
+read_cfg_var(cfg_file, "obdr", value);
+if (strstr(value, "TRUE")) {
+    bkpinfo->use_obdr = TRUE;
+    log_msg(1, "OBDR mode activated");
 }
 
 read_cfg_var(cfg_file, "acl", value);
 if (strstr(value, "TRUE")) {
-asprintf(&g_getfacl,"setfacl");
-log_msg(1, "We will restore ACLs");
-if (! find_home_of_exe("setfacl")) {
-    log_msg(1, "Unable to restore ACLs as no setfacl found");
-}
+    asprintf(&g_getfacl,"setfacl");
+    log_msg(1, "We will restore ACLs");
+    if (! find_home_of_exe("setfacl")) {
+        log_msg(1, "Unable to restore ACLs as no setfacl found");
+    }
 }
 read_cfg_var(cfg_file, "xattr", value);
 if (strstr(value, "TRUE")) {
-asprintf(&g_getfattr,"setfattr");
-log_msg(1, "We will restore XATTRs");
-if (! find_home_of_exe("setfattr")) {
-    log_msg(1, "Unable to restore XATTRs as no setfattr found");
-}
+    asprintf(&g_getfattr,"setfattr");
+    log_msg(1, "We will restore XATTRs");
+    if (! find_home_of_exe("setfattr")) {
+        log_msg(1, "Unable to restore XATTRs as no setfattr found");
+    }
 }