← Back to branch summary

~ecryptfs/ecryptfs/oldtrunk2

« back to all changes in this revision

Viewing changes to tests/lib/etl_funcs.sh

  • Committer: Tyler Hicks
  • Author(s): Colin King
  • Date: 2012-03-30 14:23:35 UTC
  • mfrom: (660.1.12 new-tests)
  • Revision ID: tyhicks@canonical.com-20120330142335-xbaw1enhujsjmku3
cater for correct ext2 default mount flags

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/lib/etl_funcs.sh
29
29
 
30
30
default_lfs="ext4"
31
31
default_lmount_opts="rw,relatime"
32
 
default_ext_opts="user_xattr,acl,commit=600,barrier=1,data=ordered"
 
32
default_ext2_opts="user_xattr,acl"
 
33
default_ext3_opts="user_xattr,acl,commit=600,barrier=1,data=ordered"
33
34
default_mount_opts="rw,relatime,ecryptfs_cipher=aes,ecryptfs_key_bytes=16,ecryptfs_sig=\${ETL_FEKEK_SIG}"
34
35
default_fne_mount_opts="${default_mount_opts},ecryptfs_fnek_sig=\${ETL_FNEK_SIG}"
35
36
 
326
327
 
327
328
        # TODO: Add support for more filesystems
328
329
        case $ETL_LFS in
329
 
        ext2|ext3|ext4)
330
 
                lmount_opts=${default_lmount_opts},${default_ext_opts}
 
330
        ext2)
 
331
                lmount_opts=${default_lmount_opts},${default_ext2_opts}
 
332
                ;;
 
333
        ext3|ext4)
 
334
                lmount_opts=${default_lmount_opts},${default_ext3_opts}
331
335
                ;;
332
336
        *)
333
337
                lmount_opts=$default_lmount_opts