Changeset 3448


Ignore:
Timestamp:
Aug 30, 2015, 2:35:24 AM (3 years ago)
Author:
bruno
Message:
  • Fix a typo in mondo-prep
  • is_this_device_mounted now call mr-device-mounted (a perl rewrite and improvement of this function)
Location:
branches/3.2/mondo/src
Files:
2 edited

Legend:

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

    r3432 r3448  
    10681068{
    10691069
    1070     /*@ pointers **************************************************** */
     1070    char *tmp = NULL;
     1071    bool retval = FALSE;
     1072
     1073    mr_asprintf(tmp, "mr-device-mounted %s", device_raw);
     1074    if (system(tmp) == 0) {
     1075        retval = TRUE;
     1076    }
     1077    mr_free(tmp);
     1078    return(retval)
     1079
     1080/* previous C version replaced by a call to a perl script, fixing issues with symlinks between devices - RHEL7 e.g.
    10711081    FILE *fin;
    10721082
    1073     /*@ buffers ***************************************************** */
    10741083    char *incoming = NULL;
    10751084    char *device_with_tab = NULL;
     
    10841093#endif
    10851094
    1086     /*@ end vars **************************************************** */
    10871095
    10881096    if (device_raw == NULL) {
     
    11321140    return(retval);
    11331141}
     1142*/
    11341143
    11351144#ifdef __FreeBSD__
  • branches/3.2/mondo/src/mondorestore/mondo-prep.c

    r3438 r3448  
    640640char *tmp = NULL;
    641641int res = 0;
    642 int retval = 0;
    643642
    644643/** end ****************************************************************/
     
    787786log_to_screen(tmp);
    788787mr_free(tmp);
    789 }
     788
    790789retval += res;
    791790paranoid_system("sync");
Note: See TracChangeset for help on using the changeset viewer.