diff options
| author | Karel Zak | 2016-12-09 15:11:31 +0100 |
|---|---|---|
| committer | Karel Zak | 2016-12-09 15:36:14 +0100 |
| commit | 0a14cc8bcc151e03c8979ed1ff4a3bee9672365b (patch) | |
| tree | 5f72c2484435b556ddec93bd162e9e5f5dedbd9d /libmount/src/optmap.c | |
| parent | Merge branch doc_fixes (diff) | |
| download | kernel-qcow2-util-linux-0a14cc8bcc151e03c8979ed1ff4a3bee9672365b.tar.gz kernel-qcow2-util-linux-0a14cc8bcc151e03c8979ed1ff4a3bee9672365b.tar.xz kernel-qcow2-util-linux-0a14cc8bcc151e03c8979ed1ff4a3bee9672365b.zip | |
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 <kzak@redhat.com>
Diffstat (limited to 'libmount/src/optmap.c')
| -rw-r--r-- | libmount/src/optmap.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/libmount/src/optmap.c b/libmount/src/optmap.c index 114eb994e..0aa285f93 100644 --- a/libmount/src/optmap.c +++ b/libmount/src/optmap.c @@ -160,15 +160,8 @@ 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 */ + { "x-", MNT_MS_XCOMMENT, MNT_NOHLPS | MNT_PREFIX }, /* persistent comments (utab) */ + { "X-", MNT_MS_XFSTABCOMM, MNT_NOHLPS | MNT_NOMTAB | MNT_PREFIX }, /* fstab only comments */ { "loop[=]", MNT_MS_LOOP, MNT_NOHLPS }, /* use the loop device */ { "offset=", MNT_MS_OFFSET, MNT_NOHLPS | MNT_NOMTAB }, /* loop device offset */ |