summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorKarel Zak2007-11-28 14:08:33 +0100
committerKarel Zak2007-11-28 14:08:33 +0100
commit4d43977ffcd294e58b9594ce479448fd91f88129 (patch)
tree2d179b1b868472498941e113ea25b049705c8654 /tests
parentagetty: non-linux support (use pathnames.h) (diff)
downloadkernel-qcow2-util-linux-4d43977ffcd294e58b9594ce479448fd91f88129.tar.gz
kernel-qcow2-util-linux-4d43977ffcd294e58b9594ce479448fd91f88129.tar.xz
kernel-qcow2-util-linux-4d43977ffcd294e58b9594ce479448fd91f88129.zip
include: add mount paths to pathnames.h
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/expected/ts-include-pathnames11
-rw-r--r--tests/helpers/test_pathnames.c11
2 files changed, 20 insertions, 2 deletions
diff --git a/tests/expected/ts-include-pathnames b/tests/expected/ts-include-pathnames
index a60154477..318f44e5a 100644
--- a/tests/expected/ts-include-pathnames
+++ b/tests/expected/ts-include-pathnames
@@ -15,7 +15,6 @@
_PATH_SHUTDOWN_CONF /etc/shutdown.conf
_PATH_SECURE /etc/securesingle
_PATH_USERTTY /etc/usertty
- _PATH_MTAB /etc/mtab
_PATH_UMOUNT /bin/umount
_PATH_PASSWD /etc/passwd
_PATH_GSHADOW /etc/gshadow
@@ -32,3 +31,13 @@ _PATH_SHADOW_PTMPTMP /etc/sptmptmp
_PATH_SHADOW_GTMPTMP /etc/sgtmptmp
_PATH_WORDS /usr/share/dict/words
_PATH_WORDS_ALT /usr/share/dict/web2
+ _PATH_UMOUNT /bin/umount
+ _PATH_FILESYSTEMS /etc/filesystems
+ _PATH_PROC_SWAPS /proc/swaps
+_PATH_PROC_FILESYSTEMS /proc/filesystems
+ _PATH_MOUNTED /etc/mtab
+ _PATH_MNTTAB /etc/fstab
+ _PATH_MOUNTED_LOCK /etc/mtab~
+ _PATH_MOUNTED_TMP /etc/mtab.tmp
+ _PATH_DEV_BYLABEL /dev/disk/by-label
+ _PATH_DEV_BYUUID /dev/disk/by-uuid
diff --git a/tests/helpers/test_pathnames.c b/tests/helpers/test_pathnames.c
index 594f45833..1accedecd 100644
--- a/tests/helpers/test_pathnames.c
+++ b/tests/helpers/test_pathnames.c
@@ -48,7 +48,6 @@ struct hlpPath paths[] =
DEF_HLPPATH(_PATH_SHUTDOWN_CONF),
DEF_HLPPATH(_PATH_SECURE),
DEF_HLPPATH(_PATH_USERTTY),
- DEF_HLPPATH(_PATH_MTAB),
DEF_HLPPATH(_PATH_UMOUNT),
DEF_HLPPATH(_PATH_PASSWD),
DEF_HLPPATH(_PATH_GSHADOW),
@@ -65,6 +64,16 @@ struct hlpPath paths[] =
DEF_HLPPATH(_PATH_SHADOW_GTMPTMP),
DEF_HLPPATH(_PATH_WORDS),
DEF_HLPPATH(_PATH_WORDS_ALT),
+ DEF_HLPPATH(_PATH_UMOUNT),
+ DEF_HLPPATH(_PATH_FILESYSTEMS),
+ DEF_HLPPATH(_PATH_PROC_SWAPS),
+ DEF_HLPPATH(_PATH_PROC_FILESYSTEMS),
+ DEF_HLPPATH(_PATH_MOUNTED),
+ DEF_HLPPATH(_PATH_MNTTAB),
+ DEF_HLPPATH(_PATH_MOUNTED_LOCK),
+ DEF_HLPPATH(_PATH_MOUNTED_TMP),
+ DEF_HLPPATH(_PATH_DEV_BYLABEL),
+ DEF_HLPPATH(_PATH_DEV_BYUUID),
{ NULL, NULL }
};