Changeset 3876 in MondoRescue for branches/3.3/mondo/src

Timestamp:

Mar 8, 2024, 3:31:58 AM (4 months ago)

Author:

Bruno Cornec

Message:

Fix mount_media calls

Location:

branches/3.3/mondo/src

Files:

• common/libmondo-devices-EXT.h (modified) (2 diffs)
• include/my-stuff.h (modified) (1 diff)
• mondorestore/mondo-rstr-tools.c (modified) (4 diffs)
• mondorestore/mondorestore.c (modified) (3 diffs)

branches/3.3/mondo/src/common/libmondo-devices-EXT.h

@@ -4 +4 @@
 /* Reviewed */
 extern char *find_optical_device(void);
+extern bool find_and_mount_actual_cd(char *mountpoint);
+extern bool mount_media(char *mountpoint);
 
 /* TBC */
@@ -10 +12 @@
 extern int does_partition_exist(const char *drive, int partno);
 extern bool does_string_exist_in_boot_block(char *dev, char *str);
-extern int find_and_mount_actual_cd(char *mountpoint);
 extern long get_phys_size_of_drive(char *drive);
 extern bool is_this_a_valid_disk_format(char *format);

branches/3.3/mondo/src/include/my-stuff.h

@@ -307 +307 @@
 #ifdef __FreeBSD__
 #define VANILLA_SCSI_CDROM  "/dev/cd0"
+#define ALT_CDROM   "/dev/ad0"
 #define VANILLA_SCSI_TAPE   "/dev/sa0"
 #define VANILLA_USB_DEVICE  "tobegivenbybsdguru"

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

@@ -89 +89 @@
 extern void kill_anything_like_this(char *str);
 extern int skip_obdr(void);
-extern int mount_media();
 extern int set_tape_block_size_with_mt(long internal_tape_block_size);
 
@@ -362 +361 @@
 }
 if (!IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-    mount_media();
+    mount_media(MNT_CDROM);
 }
 i = what_number_cd_is_this();   /* has the side-effect of calling mount_media() */
@@ -984 +983 @@
                 mr_free(bkpinfo->isodir);
                 iso_mnt[0] = iso_path[0] = '\0';
-                if (mount_media()) {
+                if (mount_media(MNT_CDROM)) {
                     mr_free(tmp1);
                     fatal_error("Unable to mount isodir. Failed to mount CD-ROM as well.");
@@ -2165 +2164 @@
         } else {
             log_msg(2, "gcffa --- calling mount_media now :)");
-            if (!mount_media()) {
+            if (!mount_media(MNT_CDROM)) {
                 log_msg(2, "gcffa --- managed to mount CD; so, no need for Plan B");
                 try_plan_B = FALSE;

branches/3.3/mondo/src/mondorestore/mondorestore.c

@@ -56 +56 @@
 extern int partition_everything(struct mountlist_itself *mountlist);
 extern int handle_incoming_parameters(int argc, char *argv[]);
-extern int mount_media();
 
 /**
@@ -1775 +1774 @@
     mr_free(tmp);
     mvaddstr_and_log_it(g_currentY, 0, "Preparing to read your archives");
-    mount_media();
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         mvaddstr_and_log_it(g_currentY++, 0,
@@ -1793 +1791 @@
         }
     } else {
+        mount_media(MNT_CDROM);
         mvaddstr_and_log_it(g_currentY++, 0,
                             "Restoring OS and data from CD/USB   ");