char *mp;
char *error;
- ABS_PATH (mountpoint, , return -1);
+ ABS_PATH (mountpoint, 0, return -1);
is_root = STREQ (mountpoint, "/");
}
if (is_dev)
- RESOLVE_DEVICE (buf, , { free (buf); return -1; });
+ RESOLVE_DEVICE (buf, 0, { free (buf); return -1; });
r = command (NULL, &err, "umount", buf, NULL);
free (buf);
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;
}
int r;
/* NEED_ROOT (return -1); - we don't want this test for this call. */
- ABS_PATH (path, , return -1);
+ ABS_PATH (path, 0, return -1);
CHROOT_IN;
r = mkdir (path, 0777);
int r;
/* NEED_ROOT (return -1); - we don't want this test for this call. */
- ABS_PATH (path, , return -1);
+ ABS_PATH (path, 0, return -1);
CHROOT_IN;
r = rmdir (path);