Changeset 3876 in MondoRescue


Ignore:
Timestamp:
Mar 8, 2024, 3:31:58 AM (3 months ago)
Author:
Bruno Cornec
Message:

Fix mount_media calls

Location:
branches/3.3/mondo/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/3.3/mondo/src/common/libmondo-devices-EXT.h

    r3875 r3876  
    44/* Reviewed */
    55extern char *find_optical_device(void);
     6extern bool find_and_mount_actual_cd(char *mountpoint);
     7extern bool mount_media(char *mountpoint);
    68
    79/* TBC */
     
    1012extern int does_partition_exist(const char *drive, int partno);
    1113extern bool does_string_exist_in_boot_block(char *dev, char *str);
    12 extern int find_and_mount_actual_cd(char *mountpoint);
    1314extern long get_phys_size_of_drive(char *drive);
    1415extern bool is_this_a_valid_disk_format(char *format);
  • branches/3.3/mondo/src/include/my-stuff.h

    r3872 r3876  
    307307#ifdef __FreeBSD__
    308308#define VANILLA_SCSI_CDROM  "/dev/cd0"
     309#define ALT_CDROM   "/dev/ad0"
    309310#define VANILLA_SCSI_TAPE   "/dev/sa0"
    310311#define VANILLA_USB_DEVICE  "tobegivenbybsdguru"
  • branches/3.3/mondo/src/mondorestore/mondo-rstr-tools.c

    r3874 r3876  
    8989extern void kill_anything_like_this(char *str);
    9090extern int skip_obdr(void);
    91 extern int mount_media();
    9291extern int set_tape_block_size_with_mt(long internal_tape_block_size);
    9392
     
    362361}
    363362if (!IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
    364     mount_media();
     363    mount_media(MNT_CDROM);
    365364}
    366365i = what_number_cd_is_this();   /* has the side-effect of calling mount_media() */
     
    984983                mr_free(bkpinfo->isodir);
    985984                iso_mnt[0] = iso_path[0] = '\0';
    986                 if (mount_media()) {
     985                if (mount_media(MNT_CDROM)) {
    987986                    mr_free(tmp1);
    988987                    fatal_error("Unable to mount isodir. Failed to mount CD-ROM as well.");
     
    21652164        } else {
    21662165            log_msg(2, "gcffa --- calling mount_media now :)");
    2167             if (!mount_media()) {
     2166            if (!mount_media(MNT_CDROM)) {
    21682167                log_msg(2, "gcffa --- managed to mount CD; so, no need for Plan B");
    21692168                try_plan_B = FALSE;
  • branches/3.3/mondo/src/mondorestore/mondorestore.c

    r3873 r3876  
    5656extern int partition_everything(struct mountlist_itself *mountlist);
    5757extern int handle_incoming_parameters(int argc, char *argv[]);
    58 extern int mount_media();
    5958
    6059/**
     
    17751774    mr_free(tmp);
    17761775    mvaddstr_and_log_it(g_currentY, 0, "Preparing to read your archives");
    1777     mount_media();
    17781776    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
    17791777        mvaddstr_and_log_it(g_currentY++, 0,
     
    17931791        }
    17941792    } else {
     1793        mount_media(MNT_CDROM);
    17951794        mvaddstr_and_log_it(g_currentY++, 0,
    17961795                            "Restoring OS and data from CD/USB   ");
Note: See TracChangeset for help on using the changeset viewer.