From 0a14cc8bcc151e03c8979ed1ff4a3bee9672365b Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Fri, 9 Dec 2016 15:11:31 +0100 Subject: libmount: revert X-* and x-* meaning Let's hope this is last change necessary to cleanup x-* usage: x-* persistent option, stored in utab, available for umount, etc. X-* fstab comment only mount(8) supports x-mount.mkdir= as well as newly recommended X-mount.mkdir= Advantages: * less invasive * does not require exception for x-systemd * does not require rename x-initrd to X-initrd The systemd and dracut users will get the new (=fixed) functionality without a change in fstab configuration. This is the primary goal. Disadvantages: * not 100% compatible libmount behavior, x-* options have not been previously stored in utab. The API is the same, options will be still available, but on x-* libmount will write to /run/mount/utab. For now it seems only systemd uses x-*, and they like this behavior, so... Addresses: https://github.com/systemd/systemd/pull/4515 Signed-off-by: Karel Zak --- libmount/src/libmount.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmount/src/libmount.h.in') diff --git a/libmount/src/libmount.h.in b/libmount/src/libmount.h.in index cbd4f000e..f191a52fe 100644 --- a/libmount/src/libmount.h.in +++ b/libmount/src/libmount.h.in @@ -774,7 +774,7 @@ extern int mnt_context_set_syscall_status(struct libmnt_context *cxt, int status #define MNT_MS_OFFSET (1 << 14) #define MNT_MS_SIZELIMIT (1 << 15) #define MNT_MS_ENCRYPTION (1 << 16) -#define MNT_MS_XPERSIST (1 << 17) +#define MNT_MS_XFSTABCOMM (1 << 17) /* * mount(2) MS_* masks (MNT_MAP_LINUX map) -- cgit v1.2.3-55-g7522