diff options
| author | Karel Zak | 2011-03-31 21:26:57 +0200 |
|---|---|---|
| committer | Karel Zak | 2011-03-31 21:26:57 +0200 |
| commit | a362ae601a4f047d56fc8487155733309da5a7ec (patch) | |
| tree | 43cb2e779a382f7634d936d61dc1edefc06bdb55 /shlibs/mount/src/mountP.h | |
| parent | tests: add dump from PPC64 to lscpu tests (diff) | |
| download | kernel-qcow2-util-linux-a362ae601a4f047d56fc8487155733309da5a7ec.tar.gz kernel-qcow2-util-linux-a362ae601a4f047d56fc8487155733309da5a7ec.tar.xz kernel-qcow2-util-linux-a362ae601a4f047d56fc8487155733309da5a7ec.zip | |
libmount: support /run/mount rather than /dev/.mount
The /run directory should be preferred on distributions where this
directory exists.
http://thread.gmane.org/gmane.linux.redhat.fedora.devel/146976
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'shlibs/mount/src/mountP.h')
| -rw-r--r-- | shlibs/mount/src/mountP.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/shlibs/mount/src/mountP.h b/shlibs/mount/src/mountP.h index 00ca8875f..a72c2560d 100644 --- a/shlibs/mount/src/mountP.h +++ b/shlibs/mount/src/mountP.h @@ -92,7 +92,11 @@ mnt_debug_h(void *handler, const char *mesg, ...) #define MNT_MNTTABDIR_EXT ".fstab" /* library private paths */ -#define MNT_PATH_UTAB "/dev/.mount/utab" +#define MNT_RUNTIME_TOPDIR "/run" +#define MNT_RUNTIME_TOPDIR_OLD "/dev" + +#define MNT_PATH_UTAB MNT_RUNTIME_TOPDIR "/mount/utab" +#define MNT_PATH_UTAB_OLD MNT_RUNTIME_TOPDIR_OLD "/.mount/utab" #define MNT_UTAB_HEADER "# libmount utab file\n" @@ -196,7 +200,7 @@ struct libmnt_fs { #define MNT_FS_NET (1 << 2) /* network filesystem */ #define MNT_FS_SWAP (1 << 3) /* swap device */ #define MNT_FS_KERNEL (1 << 4) /* data from /proc/{mounts,self/mountinfo} */ -#define MNT_FS_MERGED (1 << 5) /* already merged data from /dev/.mount/utab */ +#define MNT_FS_MERGED (1 << 5) /* already merged data from /run/mount/utab */ extern int __mnt_fs_get_flags(struct libmnt_fs *fs); extern int __mnt_fs_set_flags(struct libmnt_fs *fs, int flags); |