Changeset 1968 in MondoRescue

Timestamp:

May 29, 2008, 7:01:36 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Call skip_obdr before extracting conf files
• Do not call cdrecord for tape detection at restore time (removes /dev/nst0)
• if using auto mode, do not ask for device type
• sleep 10 s after usb-storage loading to let time to system to detect tape drive

Location:

branches/2.2.6

Files:

• mindi/rootfs/sbin/init (modified) (1 diff)
• mondo/src/common/libmondo-devices.c (modified) (1 diff)
• mondo/src/common/libmondo-stream.c (modified) (3 diffs)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (6 diffs)
• mondo/src/mondorestore/mondorestore.c (modified) (3 diffs)

branches/2.2.6/mindi/rootfs/sbin/init

@@ -125 +125 @@
     tapedev="" ; # will be set by UntarTapeStuff()
 
-    # Here we can add the USB stirage module, it's working !
+    # Here we can add the USB storage module, it's working even with OBDR !
     modprobe -q usb-storage
+    # Tape takes some time to appear
+    sleep 10
     cd $GROOVY
     UntarTapeStuff $tapedev

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

@@ -1834 +1834 @@
     case tape:
 
-        if (find_tape_device_and_size(bkpinfo->media_device, sz_size)) {
+        if ((find_tape_device_and_size(bkpinfo->media_device, sz_size)) && (!bkpinfo->restore_mode)) {
             log_msg(3, "Ok, using vanilla scsi tape.");
             strcpy(bkpinfo->media_device, VANILLA_SCSI_TAPE);

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

@@ -260 +260 @@
     char command[MAX_STR_LEN * 2];
     char cdr_exe[MAX_STR_LEN];
-//  char tape_description_[MAX_STR_LEN];
-//  char tape_manufacturer_cdr[MAX_STR_LEN];
-//  FILE*fin;
     int res;
 
@@ -679 +676 @@
  * @param tapedev The tape device to open for reading.
  */
-int skip_obdr()
+int skip_obdr(void)
 {
     char *command = NULL;
@@ -704 +701 @@
  * EXISTING DATA on the tape!
  */
-int create_obdr()
+int create_obdr(void)
 {
 

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

@@ -169 +169 @@
 
 extern void kill_anything_like_this(char *str);
+extern int skip_obdr(void);
 
 /**
@@ -1017 +1018 @@
         log_msg(2, tmp);
     } else if (bkpinfo->backup_media_type == tape
-            || bkpinfo->backup_media_type == udev) {
+            || bkpinfo->backup_media_type == udev) {
         if (read_cfg_var(cfg_file, "media-dev", value)) {
             fatal_error("Cannot get tape device name from cfg file");
@@ -1134 +1135 @@
     } else {
         read_cfg_var(g_mondo_cfg_file, "nfs-server-mount",
-                    bkpinfo->nfs_mount);
+                    bkpinfo->nfs_mount);
         read_cfg_var(g_mondo_cfg_file, "nfs-server-path",
-                    bkpinfo->nfs_remote_dir);
+                    bkpinfo->nfs_remote_dir);
         log_msg(2, "nfs_mount is %s", bkpinfo->nfs_mount);
         log_msg(2, "nfs_remote_dir is %s", bkpinfo->nfs_remote_dir);
     }
     if (strstr(call_program_and_get_last_line_of_output
-        ("cat /proc/cmdline"), "pxe")) {
-        /* We need to override values in PXE mode as it's 
+        ("cat /proc/cmdline"), "pxe")) {
+        /* We need to override values in PXE mode as it's
         * already done in start-nfs */
         envtmp1 = getenv("nfsmount");
@@ -1187 +1188 @@
             log_it("command = %s", command);
             log_it("res of it = %s",
-                call_program_and_get_last_line_of_output(command));
+                call_program_and_get_last_line_of_output(command));
             sprintf(iso_mnt, "%s",
                     call_program_and_get_last_line_of_output(command));
@@ -1226 +1227 @@
             get_cfg_file_from_archive();
     /*
-        if (media_specified_by_user != cdr && media_specified_by_user == cdrw)
+        if (media_specified_by_user != cdr && media_specified_by_user == cdrw)
             { g_restoring_live_from_cd = FALSE; }
     */
@@ -2218 +2219 @@
     malloc_string(command);
 
+    if (bkpinfo->use_obdr) {
+        skip_obdr();
+    }
     // tar -zxvf-
     sprintf(command,

branches/2.2.6/mondo/src/mondorestore/mondorestore.c

@@ -47 +47 @@
 
 extern int partition_everything(struct mountlist_itself *mountlist);
-
+extern int handle_incoming_parameters(int argc, char *argv[]);
 
 /**
@@ -268 +268 @@
     c = which_restore_mode();
     iamhere("post wrm");
-    if (c == 'I' || c == 'N' || c == 'C') {
+    if (c == 'I' || c == 'C') {
         interactively_obtain_media_parameters_from_user(FALSE);
     } else {
@@ -433 +433 @@
         }
     }
-    
+
 #ifdef __FreeBSD__
     if (strstr