if (is_root)
root_mounted = 1;
+ free (error);
return 0;
}
char *p, *pend, *p2;
int len;
char matching[5 + sysroot_len];
+ size_t i;
r = command (&out, &err, "mount", NULL);
if (r == -1) {
if (add_string (&ret, &size, &alloc, NULL) == -1)
return NULL;
+ /* Convert /dev/mapper LV paths into canonical paths (RHBZ#646432). */
+ for (i = 0; ret[i] != NULL; i += mp ? 2 : 1) {
+ if (STRPREFIX (ret[i], "/dev/mapper/") || STRPREFIX (ret[i], "/dev/dm-")) {
+ char *canonical;
+ r = lv_canonical (ret[i], &canonical);
+ if (r == -1) {
+ free_strings (ret);
+ return NULL;
+ }
+ if (r == 1) {
+ free (ret[i]);
+ ret[i] = canonical;
+ }
+ /* Ignore the case where r == 0. This might happen where
+ * eg. a LUKS /dev/mapper device is mounted, but that won't
+ * correspond to any LV.
+ */
+ }
+ }
+
return ret;
}
}
buf = sysroot_path (file);
- if (!file) {
+ if (!buf) {
reply_with_perror ("malloc");
free (mp);
return -1;
return -1;
}
+ free (error);
return 0;
}