diff options
| author | Karel Zak | 2016-12-08 14:29:44 +0100 |
|---|---|---|
| committer | Karel Zak | 2016-12-08 15:27:24 +0100 |
| commit | 5c493bd92f1a6858e9cb5c98d667b0aabd945b28 (patch) | |
| tree | 9e9f8d4dad977cb52c281aaf42b8138d3efdf896 /libmount/src/optmap.c | |
| parent | libmount: introduce X-* comments (diff) | |
| download | kernel-qcow2-util-linux-5c493bd92f1a6858e9cb5c98d667b0aabd945b28.tar.gz kernel-qcow2-util-linux-5c493bd92f1a6858e9cb5c98d667b0aabd945b28.tar.xz kernel-qcow2-util-linux-5c493bd92f1a6858e9cb5c98d667b0aabd945b28.zip | |
libmount: use x-systemd options as X-*
The previous patch introduces X-* options namespace for options
that have to be maintained in user space.
Unfortunately, systemd users already use mount options that are
necessary by umount or another operations. The conclusion from
discussion with systemd guys is to store all the systemd options
in userspace.
It seems better to add one line exception to libmount than force all
fstab users to rename x-systemd to X-systemd.
Addresses: https://github.com/systemd/systemd/pull/3904
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libmount/src/optmap.c')
| -rw-r--r-- | libmount/src/optmap.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libmount/src/optmap.c b/libmount/src/optmap.c index 6fdaa7a41..114eb994e 100644 --- a/libmount/src/optmap.c +++ b/libmount/src/optmap.c @@ -160,6 +160,13 @@ static const struct libmnt_optmap userspace_opts_map[] = { "comment=", MNT_MS_COMMENT, MNT_NOHLPS | MNT_NOMTAB },/* fstab comment only */ + /* + * systemd assumes that x-systemd options namespace is available for umount, + * let's use the options as X-* + */ +#ifdef HAVE_SYSTEMD + { "x-systemd", MNT_MS_XPERSIST, MNT_NOHLPS | MNT_PREFIX }, /* like X-* */ +#endif { "X-", MNT_MS_XPERSIST, MNT_NOHLPS | MNT_PREFIX }, /* X- persistent comments (utab) */ { "x-", MNT_MS_XCOMMENT, MNT_NOHLPS | MNT_NOMTAB | MNT_PREFIX }, /* x- fstab only comments */ |