Ignore:
Timestamp:
Apr 10, 2008, 1:13:58 AM (11 years ago)
Author:
bruno
Message:

merge -r 1842:1889 2.2.5

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mondo/src/common/libmondo-devices.c

    r1842 r1903  
    15761576    }
    15771577    if (bkpinfo->backup_media_type == tape && bkpinfo->restore_data) {
    1578         popup_and_OK(_("Please remove CD from drive"));
     1578        popup_and_OK(_("Please remove media from drive"));
    15791579    }
    15801580    mr_msg(3, "media type = %s",
     
    18041804
    18051805    case nfs:
     1806        /* Never try to eject a NFS device */
     1807        bkpinfo->please_dont_eject = TRUE;
     1808
     1809        /* Initiate bkpinfo nfs_mount path from running environment if not already done */
    18061810        if (!bkpinfo->nfs_mount[0]) {
    18071811            strcpy(bkpinfo->nfs_mount,
     
    18401844            mr_free(command);
    18411845
    1842             mr_asprintf(&comment,
     1846            if (!bkpinfo->restore_data) {
     1847                mr_asprintf(&comment,
    18431848                    _("How much data (in Megabytes) will each media store?"));
    1844             if (!popup_and_get_string(_("Size"), comment, sz_size, 5)) {
    1845                 log_to_screen(_("User has chosen not to backup the PC"));
    1846                 finish(1);
     1849                if (!popup_and_get_string(_("Size"), comment, sz_size, 5)) {
     1850                    log_to_screen(_("User has chosen not to backup the PC"));
     1851                    finish(1);
     1852                }
     1853            } else {
     1854                sz_size = 0;
    18471855            }
    18481856            mr_free(comment);
     
    18631871            }
    18641872        }
    1865         if (!is_this_device_mounted(bkpinfo->nfs_mount)) {
     1873        /* Initiate bkpinfo isodir path from running environment if mount already done */
     1874        if (is_this_device_mounted(bkpinfo->nfs_mount)) {
     1875            strcpy(bkpinfo->isodir,
     1876                   call_program_and_get_last_line_of_output
     1877                   ("mount | grep \":\" | cut -d' ' -f3 | head -n1"));
     1878        } else {
    18661879            sprintf(bkpinfo->isodir, "%s/nfsdir", bkpinfo->tmpdir);
    18671880            mr_asprintf(&command, "mkdir -p %s", bkpinfo->isodir);
Note: See TracChangeset for help on using the changeset viewer.