Changeset 3448 in MondoRescue for branches

Timestamp:

Aug 30, 2015, 2:35:24 AM (10 years ago)

Author:

Bruno Cornec

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:

• common/libmondo-devices.c (modified) (3 diffs)
• mondorestore/mondo-prep.c (modified) (2 diffs)

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

@@ -1068 +1068 @@
 {
 
-    /*@ pointers **************************************************** */
+    char *tmp = NULL;
+    bool retval = FALSE;
+
+    mr_asprintf(tmp, "mr-device-mounted %s", device_raw);
+    if (system(tmp) == 0) {
+        retval = TRUE;
+    }
+    mr_free(tmp);
+    return(retval)
+
+/* previous C version replaced by a call to a perl script, fixing issues with symlinks between devices - RHEL7 e.g.
     FILE *fin;
 
-    /*@ buffers ***************************************************** */
     char *incoming = NULL;
     char *device_with_tab = NULL;
@@ -1084 +1093 @@
 #endif
 
-    /*@ end vars **************************************************** */
 
     if (device_raw == NULL) {
@@ -1132 +1140 @@
     return(retval);
 }
+*/
 
 #ifdef __FreeBSD__

branches/3.2/mondo/src/mondorestore/mondo-prep.c

@@ -640 +640 @@
 char *tmp = NULL;
 int res = 0;
-int retval = 0;
 
 /** end ****************************************************************/
@@ -787 +786 @@
 log_to_screen(tmp);
 mr_free(tmp);
-}
+
 retval += res;
 paranoid_system("sync");