Changeset 2696 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-devices.c

Timestamp:

Jan 25, 2011, 10:34:40 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Adds preliminary support for hpacucli. Needs test
• Fix a compilation issue due to bad fatal_error call (no param allowed)
• Fix some HTML syntax issues in the docs page + link to Wiki articles
• Boot size pushed to 20MB
• A bit more precise for error msg from PBDI
• Exits if the protocol used is not recognized (error with -n fs:// typo)
• Adds support for r8169 net driver
• Fix a cast issue
• Precise a test case to avoid ambiguity
• Die and related functions placed before any other code as used early, and ash doesn't support function declaration. So will solve #446 by exiting mindi before doing anything weird in it.
• Fix #445 with another technical solution to avoid vg with similar names to b wrongly excluded (vgroot and vgroot-san e.g.) (Michael Shapiro)
• Fix a bug on exclusion of path with common content (/home and /path/home e.g.) which was handled correctly only in a certain order (John Pearson <johnp_at_gtagalenco.com.au>)
• mount-media function is now placed in libmondo-devices.c as used by more programs.
• Avoids calling mount_media when it's not mandatory (change the way mondorestore was working up to now but could solve some bugs reported)
• Add xhci support to mindi.
• Rewrite Xen kernel support to use TryToFindKernelPath systematically.
• mindi now copies also the /lib/firmware content in order to have it for drivers needing it (bnx2 reported)
• Push MAX_STR_LEN to 512 to allow supporting more exclude dir (2.2.10 and dyn allocation is the way to go there)
• Add virtio driver to mindi
• Initialize extra_cdrom_params in any case tp avoid passing null to cdrecord later on
• Also escapes white spaces in gen_aux_list to avoid issues in getfacl call
• Adds multiple missing drivers to mindi (mega_sr, ide_gd_mod, pata_jmicron, cp210x, dca, raid6_pq, xor async_tx, async_memcpy, async_xor)
• Fix #434 by really testing thet udevd is not running already (chucky)
• Adds support of pata_sil680 driver
• Fix again #412 !! by removing calls to tee which voids the return value of the previous command
• The way grub.unsupported was called for opensuse 11.2 was wrong. It should be done bfore calling grub-install which also exists. And tested for existence. Now this should fix #412.
• Try to provide a workaround in code to the #401 (over-allocation of space due to rounding errors)
• Fix a bug when using ACLs and file with spaces in their names by adding double quotes in getfacl invocation (Tom Mortell tomm_at_dslextreme.com). Also adding the same quotes on the touch commands made earlier.
• Points to the current latest presentation instead of the old one
• mondo-ref-card added to the docs web page
• Add the mondoarchive reference card (Lester Wade)
• Change useless comments for more useful ones
• mindi is now able to handle compressed kernel with .gz or .bz2 suffix (case of OpenSuSE 11.2)
• Improves logging for external binary
• Improve Xen kernel detection and avoid false detection (Michael Shapiro)
• Updated P2V doc from Lester Wade (lester.wade_at_hp.com)

Baclports from 2.2.9
svn merge -r 2650:2695 ​svn+ssh://bruno@svn.mondorescue.org/mondo/svn/mondorescue/branches/2.2.9 .

File:

• branches/2.2.10/mondo/src/common/libmondo-devices.c (modified) (3 diffs)

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

@@ -1271 +1271 @@
 
 
+/**
+* Mount the CD-ROM or USB device at /mnt/cdrom.
+* @param bkpinfo The backup information structure. Fields used: 
+* - @c bkpinfo->backup_media_type
+* - @c bkpinfo->disaster_recovery
+* - @c bkpinfo->isodir
+* - @c bkpinfo->media_device
+* @return 0 for success, nonzero for failure.
+*/
+int mount_media()
+{
+char *mount_cmd = NULL;
+int i, res;
+#ifdef __FreeBSD__
+    char mdd[32];
+    char *mddev = mdd;
+#endif
+
+    if (bkpinfo->backup_media_type == tape || bkpinfo->backup_media_type == udev) {
+        log_msg(8, "Tape/udev. Therefore, no need to mount a media.");
+        return 0;
+    }
+
+    if (!run_program_and_log_output("mount | grep -F " MNT_CDROM, FALSE)) {
+        log_msg(2, "mount_media() - media already mounted. Fair enough.");
+        return (0);
+    }
+
+    if (bkpinfo->media_device == NULL) {
+        fatal_error("No media device at that point");
+    }
+
+    if (bkpinfo->backup_media_type == netfs) {
+        log_msg(2, "Mounting for Network thingy");
+        log_msg(2, "isodir = %s", bkpinfo->isodir);
+        if (!strcmp(bkpinfo->isodir, "/") && am_I_in_disaster_recovery_mode()) {
+            mr_free(bkpinfo->isodir);
+            mr_asprintf(bkpinfo->isodir, "/tmp/isodir");
+            log_msg(1, "isodir is being set to %s", bkpinfo->isodir);
+        }
+        if ((bkpinfo->isodir == NULL) || (bkpinfo->netfs_remote_dir == NULL) || (bkpinfo->prefix == NULL)) {
+            fatal_error("Unable to prepare the iso filename");
+        }
+#ifdef __FreeBSD__
+        mr_asprintf(mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir,
+            bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number);
+        mddev = make_vn(mount_cmd);
+        mr_free(mount_cmd);
+
+        mr_asprintf(mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
+#else
+        mr_asprintf(mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
+#endif
+
+    } else if (bkpinfo->backup_media_type == iso) {
+#ifdef __FreeBSD__
+        mr_sprintf(mount_cmd, "%s/%s-%d.iso", bkpinfo->isodir,
+            bkpinfo->prefix, g_current_media_number);
+        mddev = make_vn(mount_cmd);
+        mr_free(mount_cmd);
+
+        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s", mddev, MNT_CDROM);
+#else
+        mr_asprintf(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 (bkpinfo->backup_media_type == usb) {
+        mr_asprintf(mount_cmd, "mount -t vfat %s %s", bkpinfo->media_device, MNT_CDROM);
+    } else if (strstr(bkpinfo->media_device, "/dev/")) {
+#ifdef __FreeBSD__
+        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device, MNT_CDROM);
+#else
+        mr_asprintf(mount_cmd, "mount %s -t iso9660 -o ro %s", bkpinfo->media_device, MNT_CDROM);
+#endif
+    } else {
+        mr_free(bkpinfo->media_device);
+        if (bkpinfo->disaster_recovery && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
+            bkpinfo->media_device = last_line_of_file(MINDI_CACHE"/CDROM-LIVES-HERE");
+        } else {
+            bkpinfo->media_device = find_cdrom_device(TRUE);
+        }
+
+#ifdef __FreeBSD__
+        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device, MNT_CDROM);
+#else
+        mr_asprintf(mount_cmd, "mount %s -t iso9660 -o ro %s", bkpinfo->media_device, MNT_CDROM);
+#endif
+    }
+
+    log_msg(2, "(mount_media) --- command = %s", mount_cmd);
+    for (i = 0; i < 2; i++) {
+        res = run_program_and_log_output(mount_cmd, FALSE);
+        if (!res) {
+            break;
+        } else {
+            log_msg(2, "Failed to mount device.");
+            sleep(5);
+            sync();
+        }
+    }
+    mr_free(mount_cmd);
+
+    if (res) {
+        log_msg(2, "Failed, despite %d attempts", i);
+    } else {
+        log_msg(2, "Mounted media drive OK");
+    }
+    return (res);
+}
+/**************************************************************************
+*END_MOUNT_CDROM                                                         *
+**************************************************************************/
 
 
@@ -1316 +1427 @@
         // BERLIOS --- I'm tempted to do something about this...
         // Why unmount and remount again and again?
-        log_msg(3, "Remounting CD");
         g_ISO_restore_mode = TRUE;
-        if (is_this_device_mounted(MNT_CDROM)) {
-            run_program_and_log_output("umount " MNT_CDROM, 5);
-        }
-        mr_asprintf(tmp, "mkdir -p %s/isodir &> /dev/null", bkpinfo->tmpdir);
-        (void)system(tmp);
-        mr_free(tmp);
-
-        if (((bkpinfo->isodir == NULL) && (bkpinfo->netfs_remote_dir == NULL)) || (bkpinfo->prefix == NULL)) {
-            fatal_error("Unable to prepare ISO file name. Please report to dev team");
-        }
-        if (bkpinfo->netfs_remote_dir) {
-            // NETFS
-            mr_asprintf(tmp, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, cd_number_i_want);
-        } else {
-            // ISO
-            mr_asprintf(tmp, "%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->prefix, cd_number_i_want);
-        }
-        if (!does_file_exist(tmp)) {
-            mr_free(tmp);
-            if (bkpinfo->netfs_remote_dir) {
-                // NETFS
-                mr_asprintf(tmp, "%s/isodir/%s/%s-%d.iso", bkpinfo->tmpdir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, cd_number_i_want);
-            } else {
-                // ISO
-                mr_asprintf(tmp, "%s/isodir/%s-%d.iso", bkpinfo->tmpdir, bkpinfo->prefix, cd_number_i_want);
-            }
-            if (does_file_exist(tmp)) {
-                log_msg(1, "FIXME - hacking bkpinfo->isodir from '%s' to %s/isodir", bkpinfo->isodir, bkpinfo->tmpdir);
-                mr_free(bkpinfo->isodir);
-                mr_asprintf(bkpinfo->isodir, "%s/isodir", bkpinfo->tmpdir);
-            }
-        }
-        log_msg(3, "Mounting %s at %s", tmp, MNT_CDROM);
-        if (mount_CDROM_here(tmp, MNT_CDROM)) {
-            mr_free(tmp);
-            fatal_error("Mommy!");
-        }
-        mr_free(tmp);
+        if (!is_this_device_mounted(MNT_CDROM)) {
+            log_msg(3, "Mounting media");
+            g_current_media_number = cd_number_i_want;
+            mount_media();
+        }
     }
     if ((res = what_number_cd_is_this()) != cd_number_i_want) {
@@ -1947 +2024 @@
     case -1:
         /* we need to add a space after token to be sure our strstr test works correctly */
-        mr_asprintf(tmp1,"%s ",token);
+        mr_asprintf(tmp1," %s ",token);
         if (mode == 'E') {
             /*  Add the token if not already in the list */
-            mr_asprintf(tmp,"%s ",bkpinfo->exclude_paths);
+            mr_asprintf(tmp," %s ",bkpinfo->exclude_paths);
             if (strstr(tmp,tmp1) == NULL) {
-                mr_strcat(bkpinfo->exclude_paths, " %s", tmp1);
+                mr_strcat(bkpinfo->exclude_paths, "%s", tmp1);
             }
         } else {
             /*  Add the token if not already in the list */
-            mr_asprintf(tmp,"%s ",bkpinfo->include_paths);
+            mr_asprintf(tmp," %s ",bkpinfo->include_paths);
             if (strstr(tmp,tmp1) == NULL) {
-                mr_strcat(bkpinfo->include_paths, " %s", tmp1);
+                mr_strcat(bkpinfo->include_paths, "%s", tmp1);
             }
         }