diff options
| author | Petr Vorel <pvorel@suse.cz> | 2019-02-20 13:30:19 +0100 |
|---|---|---|
| committer | Petr Vorel <pvorel@suse.cz> | 2019-03-14 14:22:06 +0100 |
| commit | 9a5185be424739aaa45c5a62cffa6357114b934f (patch) | |
| tree | bf6034ba8873cd74940f1861c164fb3eaf1933d8 /testcases/kernel | |
| parent | 0f5d6fe4b2fe602c4be0a1a3bd9652db9c4e565d (diff) | |
ima, commands/{df,mkfs}: Use tst_mount()
to reduce duplicity.
That required to rename variable s/FS_TYPE/TST_FS_TYPE/.
Signed-off-by: Petr Vorel <pvorel@suse.cz>
Acked-by: Cyril Hrubis <chrubis@suse.cz>
Diffstat (limited to 'testcases/kernel')
| -rw-r--r-- | testcases/kernel/security/integrity/ima/tests/ima_setup.sh | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/testcases/kernel/security/integrity/ima/tests/ima_setup.sh b/testcases/kernel/security/integrity/ima/tests/ima_setup.sh index fe6098135..1ebd8484d 100644 --- a/testcases/kernel/security/integrity/ima/tests/ima_setup.sh +++ b/testcases/kernel/security/integrity/ima/tests/ima_setup.sh @@ -28,7 +28,7 @@ TST_NEEDS_ROOT=1 SYSFS="/sys" UMOUNT= -FS_TYPE="ext3" +TST_FS_TYPE="ext3" mount_helper() { @@ -53,15 +53,10 @@ mount_loop_device() { local ret - tst_test_cmds mkfs.$FS_TYPE - tst_mkfs $FS_TYPE $TST_DEVICE - ROD_SILENT mkdir -p mntpoint - mount ${TST_DEVICE} mntpoint - ret=$? - if [ $ret -ne 0 ]; then - tst_brk TBROK "failed to mount device (mount exit = $ret)" - fi - cd mntpoint + tst_test_cmds mkfs.$TST_FS_TYPE + tst_mkfs $TST_FS_TYPE $TST_DEVICE + tst_mount + cd $TST_MNTPOINT } print_ima_config() |