tests: update libmount tests (add optstr output)

Signed-off-by: Karel Zak <kzak@redhat.com>

15 files changed, 75 insertions, 1 deletions

diff --git a/tests/expected/libmount/optstr-flags b/tests/expected/libmount/optstr-flags
index 013e22c4e..5d138b510 100644
--- a/tests/expected/libmount/optstr-flags
+++ b/tests/expected/libmount/optstr-flags
@@ -1,2 +1,2 @@
-mountflags:           0x0000000a
+mountflags:           0x0000000e
 userspace-mountflags: 0x00000208
diff --git a/tests/expected/libmount/tabfiles-copy b/tests/expected/libmount/tabfiles-copy
index bc4778261..0054586bf 100644
--- a/tests/expected/libmount/tabfiles-copy
+++ b/tests/expected/libmount/tabfiles-copy
@@ -3,6 +3,7 @@ ORIGINAL:
 source: UUID=d3a8f783-df75-4dc8-9163-975a891052c0
 target: /
 fstype: ext3
+optstr: noatime,defaults
 VFS-optstr: noatime
 freq:   1
 pass:   1
@@ -11,6 +12,7 @@ COPY:
 source: UUID=d3a8f783-df75-4dc8-9163-975a891052c0
 target: /
 fstype: ext3
+optstr: noatime,defaults
 VFS-optstr: noatime
 freq:   1
 pass:   1
diff --git a/tests/expected/libmount/tabfiles-find-pair b/tests/expected/libmount/tabfiles-find-pair
index ce8f957d2..fbd730a60 100644
--- a/tests/expected/libmount/tabfiles-find-pair
+++ b/tests/expected/libmount/tabfiles-find-pair
@@ -2,4 +2,5 @@
 source: /dev/mapper/kzak-home
 target: /home/kzak
 fstype: ext4
+optstr: rw,noatime
 VFS-optstr: rw,noatime
diff --git a/tests/expected/libmount/tabfiles-find-source b/tests/expected/libmount/tabfiles-find-source
index a49fdae25..474652cbd 100644
--- a/tests/expected/libmount/tabfiles-find-source
+++ b/tests/expected/libmount/tabfiles-find-source
@@ -2,6 +2,7 @@
 source: UUID=fef7ccb3-821c-4de8-88dc-71472be5946f
 target: /boot
 fstype: ext3
+optstr: noatime,defaults
 VFS-optstr: noatime
 freq:   1
 pass:   2
diff --git a/tests/expected/libmount/tabfiles-find-target b/tests/expected/libmount/tabfiles-find-target
index 8d48723f8..1a51bd5b0 100644
--- a/tests/expected/libmount/tabfiles-find-target
+++ b/tests/expected/libmount/tabfiles-find-target
@@ -2,4 +2,5 @@
 source: /dev/mapper/foo
 target: /home/foo
 fstype: ext4
+optstr: noatime,defaults
 VFS-optstr: noatime
diff --git a/tests/expected/libmount/tabfiles-parse-fstab b/tests/expected/libmount/tabfiles-parse-fstab
index 3cdcc5d45..14bdfb451 100644
--- a/tests/expected/libmount/tabfiles-parse-fstab
+++ b/tests/expected/libmount/tabfiles-parse-fstab
@@ -2,6 +2,7 @@
 source: UUID=d3a8f783-df75-4dc8-9163-975a891052c0
 target: /
 fstype: ext3
+optstr: noatime,defaults
 VFS-optstr: noatime
 freq:   1
 pass:   1
@@ -9,6 +10,7 @@ pass:   1
 source: UUID=fef7ccb3-821c-4de8-88dc-71472be5946f
 target: /boot
 fstype: ext3
+optstr: noatime,defaults
 VFS-optstr: noatime
 freq:   1
 pass:   2
@@ -16,35 +18,43 @@ pass:   2
 source: UUID=1f2aa318-9c34-462e-8d29-260819ffd657
 target: swap
 fstype: swap
+optstr: defaults
 ------ fs:
 source: tmpfs
 target: /dev/shm
 fstype: tmpfs
+optstr: defaults
 ------ fs:
 source: devpts
 target: /dev/pts
 fstype: devpts
+optstr: gid=5,mode=620
 FS-opstr: gid=5,mode=620
 ------ fs:
 source: sysfs
 target: /sys
 fstype: sysfs
+optstr: defaults
 ------ fs:
 source: proc
 target: /proc
 fstype: proc
+optstr: defaults
 ------ fs:
 source: /dev/mapper/foo
 target: /home/foo
 fstype: ext4
+optstr: noatime,defaults
 VFS-optstr: noatime
 ------ fs:
 source: foo.com:/mnt/share
 target: /mnt/remote
 fstype: nfs
+optstr: noauto
 user-optstr: noauto
 ------ fs:
 source: //bar.com/gogogo
 target: /mnt/gogogo
 fstype: cifs
+optstr: user=SRGROUP/baby,noauto
 user-optstr: user=SRGROUP/baby,noauto
diff --git a/tests/expected/libmount/tabfiles-parse-fstab-broken b/tests/expected/libmount/tabfiles-parse-fstab-broken
index bf7566160..b838fbcc7 100644
--- a/tests/expected/libmount/tabfiles-parse-fstab-broken
+++ b/tests/expected/libmount/tabfiles-parse-fstab-broken
@@ -4,6 +4,7 @@
 source: UUID=d3a8f783-df75-4dc8-9163-975a891052c0
 target: /
 fstype: ext3
+optstr: noatime,defaults
 VFS-optstr: noatime
 freq:   1
 pass:   1
@@ -11,6 +12,7 @@ pass:   1
 source: UUID=fef7ccb3-821c-4de8-88dc-71472be5946f
 target: /boot
 fstype: ext3
+optstr: noatime,defaults
 VFS-optstr: noatime
 freq:   1
 pass:   2
@@ -18,36 +20,44 @@ pass:   2
 source: UUID=1f2aa318-9c34-462e-8d29-260819ffd657
 target: swap
 fstype: swap
+optstr: defaults
 ------ fs:
 source: tmpfs
 target: /dev/shm
 fstype: tmpfs
+optstr: defaults
 ------ fs:
 source: devpts
 target: /dev/pts
 fstype: devpts
+optstr: gid=5,mode=620
 FS-opstr: gid=5,mode=620
 ------ fs:
 source: sysfs
 target: /sys
 fstype: sysfs
+optstr: defaults
 ------ fs:
 source: proc
 target: /proc
 fstype: proc
+optstr: defaults
 ------ fs:
 source: /dev/mapper/foo
 target: /home/foo
 fstype: ext4
+optstr: noatime,defaults
 VFS-optstr: noatime
 freq:   1
 ------ fs:
 source: foo.com:/mnt/share
 target: /mnt/remote
 fstype: nfs
+optstr: noauto
 user-optstr: noauto
 ------ fs:
 source: //bar.com/gogogo
 target: /mnt/gogogo
 fstype: cifs
+optstr: user=SRGROUP/baby,noauto
 user-optstr: user=SRGROUP/baby,noauto
diff --git a/tests/expected/libmount/tabfiles-parse-mountinfo b/tests/expected/libmount/tabfiles-parse-mountinfo
index aac3591e4..95182dd5f 100644
--- a/tests/expected/libmount/tabfiles-parse-mountinfo
+++ b/tests/expected/libmount/tabfiles-parse-mountinfo
@@ -2,6 +2,7 @@
 source: /proc
 target: /proc
 fstype: proc
+optstr: rw,relatime
 VFS-optstr: rw,relatime
 FS-opstr: rw
 root:   /
@@ -12,6 +13,7 @@ devno:  0:3
 source: /sys
 target: /sys
 fstype: sysfs
+optstr: rw,relatime
 VFS-optstr: rw,relatime
 FS-opstr: rw
 root:   /
@@ -22,6 +24,7 @@ devno:  0:15
 source: udev
 target: /dev
 fstype: devtmpfs
+optstr: rw,relatime,size=1983516k,nr_inodes=495879,mode=755
 VFS-optstr: rw,relatime
 FS-opstr: rw,size=1983516k,nr_inodes=495879,mode=755
 root:   /
@@ -32,6 +35,7 @@ devno:  0:5
 source: devpts
 target: /dev/pts
 fstype: devpts
+optstr: rw,relatime,gid=5,mode=620,ptmxmode=000
 VFS-optstr: rw,relatime
 FS-opstr: rw,gid=5,mode=620,ptmxmode=000
 root:   /
@@ -42,6 +46,7 @@ devno:  0:10
 source: tmpfs
 target: /dev/shm
 fstype: tmpfs
+optstr: rw,relatime
 VFS-optstr: rw,relatime
 FS-opstr: rw
 root:   /
@@ -52,6 +57,7 @@ devno:  0:16
 source: /dev/sda4
 target: /
 fstype: ext3
+optstr: rw,noatime,errors=continue,user_xattr,acl,barrier=0,data=ordered
 VFS-optstr: rw,noatime
 FS-opstr: rw,errors=continue,user_xattr,acl,barrier=0,data=ordered
 root:   /
@@ -62,6 +68,7 @@ devno:  8:4
 source: tmpfs
 target: /sys/fs/cgroup
 fstype: tmpfs
+optstr: rw,nosuid,nodev,noexec,relatime,mode=755
 VFS-optstr: rw,nosuid,nodev,noexec,relatime
 FS-opstr: rw,mode=755
 root:   /
@@ -72,6 +79,7 @@ devno:  0:17
 source: cgroup
 target: /sys/fs/cgroup/systemd
 fstype: cgroup
+optstr: rw,nosuid,nodev,noexec,relatime,release_agent=/lib/systemd/systemd-cgroups-agent,name=systemd
 VFS-optstr: rw,nosuid,nodev,noexec,relatime
 FS-opstr: rw,release_agent=/lib/systemd/systemd-cgroups-agent,name=systemd
 root:   /
@@ -82,6 +90,7 @@ devno:  0:18
 source: cgroup
 target: /sys/fs/cgroup/cpuset
 fstype: cgroup
+optstr: rw,nosuid,nodev,noexec,relatime,cpuset
 VFS-optstr: rw,nosuid,nodev,noexec,relatime
 FS-opstr: rw,cpuset
 root:   /
@@ -92,6 +101,7 @@ devno:  0:19
 source: cgroup
 target: /sys/fs/cgroup/ns
 fstype: cgroup
+optstr: rw,nosuid,nodev,noexec,relatime,ns
 VFS-optstr: rw,nosuid,nodev,noexec,relatime
 FS-opstr: rw,ns
 root:   /
@@ -102,6 +112,7 @@ devno:  0:20
 source: cgroup
 target: /sys/fs/cgroup/cpu
 fstype: cgroup
+optstr: rw,nosuid,nodev,noexec,relatime,cpu
 VFS-optstr: rw,nosuid,nodev,noexec,relatime
 FS-opstr: rw,cpu
 root:   /
@@ -112,6 +123,7 @@ devno:  0:21
 source: cgroup
 target: /sys/fs/cgroup/cpuacct
 fstype: cgroup
+optstr: rw,nosuid,nodev,noexec,relatime,cpuacct
 VFS-optstr: rw,nosuid,nodev,noexec,relatime
 FS-opstr: rw,cpuacct
 root:   /
@@ -122,6 +134,7 @@ devno:  0:22
 source: cgroup
 target: /sys/fs/cgroup/memory
 fstype: cgroup
+optstr: rw,nosuid,nodev,noexec,relatime,memory
 VFS-optstr: rw,nosuid,nodev,noexec,relatime
 FS-opstr: rw,memory
 root:   /
@@ -132,6 +145,7 @@ devno:  0:23
 source: cgroup
 target: /sys/fs/cgroup/devices
 fstype: cgroup
+optstr: rw,nosuid,nodev,noexec,relatime,devices
 VFS-optstr: rw,nosuid,nodev,noexec,relatime
 FS-opstr: rw,devices
 root:   /
@@ -142,6 +156,7 @@ devno:  0:24
 source: cgroup
 target: /sys/fs/cgroup/freezer
 fstype: cgroup
+optstr: rw,nosuid,nodev,noexec,relatime,freezer
 VFS-optstr: rw,nosuid,nodev,noexec,relatime
 FS-opstr: rw,freezer
 root:   /
@@ -152,6 +167,7 @@ devno:  0:25
 source: cgroup
 target: /sys/fs/cgroup/net_cls
 fstype: cgroup
+optstr: rw,nosuid,nodev,noexec,relatime,net_cls
 VFS-optstr: rw,nosuid,nodev,noexec,relatime
 FS-opstr: rw,net_cls
 root:   /
@@ -162,6 +178,7 @@ devno:  0:26
 source: cgroup
 target: /sys/fs/cgroup/blkio
 fstype: cgroup
+optstr: rw,nosuid,nodev,noexec,relatime,blkio
 VFS-optstr: rw,nosuid,nodev,noexec,relatime
 FS-opstr: rw,blkio
 root:   /
@@ -172,6 +189,7 @@ devno:  0:27
 source: systemd-1
 target: /sys/kernel/security
 fstype: autofs
+optstr: rw,relatime,fd=22,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
 VFS-optstr: rw,relatime
 FS-opstr: rw,fd=22,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
 root:   /
@@ -182,6 +200,7 @@ devno:  0:28
 source: systemd-1
 target: /dev/hugepages
 fstype: autofs
+optstr: rw,relatime,fd=23,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
 VFS-optstr: rw,relatime
 FS-opstr: rw,fd=23,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
 root:   /
@@ -192,6 +211,7 @@ devno:  0:29
 source: systemd-1
 target: /sys/kernel/debug
 fstype: autofs
+optstr: rw,relatime,fd=24,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
 VFS-optstr: rw,relatime
 FS-opstr: rw,fd=24,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
 root:   /
@@ -202,6 +222,7 @@ devno:  0:30
 source: systemd-1
 target: /proc/sys/fs/binfmt_misc
 fstype: autofs
+optstr: rw,relatime,fd=25,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
 VFS-optstr: rw,relatime
 FS-opstr: rw,fd=25,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
 root:   /
@@ -212,6 +233,7 @@ devno:  0:31
 source: systemd-1
 target: /dev/mqueue
 fstype: autofs
+optstr: rw,relatime,fd=26,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
 VFS-optstr: rw,relatime
 FS-opstr: rw,fd=26,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
 root:   /
@@ -222,6 +244,7 @@ devno:  0:32
 source: /proc/bus/usb
 target: /proc/bus/usb
 fstype: usbfs
+optstr: rw,relatime
 VFS-optstr: rw,relatime
 FS-opstr: rw
 root:   /
@@ -232,6 +255,7 @@ devno:  0:14
 source: hugetlbfs
 target: /dev/hugepages
 fstype: hugetlbfs
+optstr: rw,relatime
 VFS-optstr: rw,relatime
 FS-opstr: rw
 root:   /
@@ -242,6 +266,7 @@ devno:  0:33
 source: mqueue
 target: /dev/mqueue
 fstype: mqueue
+optstr: rw,relatime
 VFS-optstr: rw,relatime
 FS-opstr: rw
 root:   /
@@ -252,6 +277,7 @@ devno:  0:12
 source: /dev/sda6
 target: /boot
 fstype: ext3
+optstr: rw,noatime,errors=continue,barrier=0,data=ordered
 VFS-optstr: rw,noatime
 FS-opstr: rw,errors=continue,barrier=0,data=ordered
 root:   /
@@ -262,6 +288,7 @@ devno:  8:6
 source: /dev/mapper/kzak-home
 target: /home/kzak
 fstype: ext4
+optstr: rw,noatime,barrier=1,data=ordered
 VFS-optstr: rw,noatime
 FS-opstr: rw,barrier=1,data=ordered
 root:   /
@@ -272,6 +299,7 @@ devno:  253:0
 source: (null)
 target: /proc/sys/fs/binfmt_misc
 fstype: binfmt_misc
+optstr: rw,relatime
 VFS-optstr: rw,relatime
 FS-opstr: rw
 root:   /
@@ -282,6 +310,7 @@ devno:  0:34
 source: fusectl
 target: /sys/fs/fuse/connections
 fstype: fusectl
+optstr: rw,relatime
 VFS-optstr: rw,relatime
 FS-opstr: rw
 root:   /
@@ -292,6 +321,7 @@ devno:  0:35
 source: gvfs-fuse-daemon
 target: /home/kzak/.gvfs
 fstype: fuse.gvfs-fuse-daemon
+optstr: rw,nosuid,nodev,relatime,user_id=500,group_id=500
 VFS-optstr: rw,nosuid,nodev,relatime
 FS-opstr: rw,user_id=500,group_id=500
 root:   /
@@ -302,6 +332,7 @@ devno:  0:36
 source: sunrpc
 target: /var/lib/nfs/rpc_pipefs
 fstype: rpc_pipefs
+optstr: rw,relatime
 VFS-optstr: rw,relatime
 FS-opstr: rw
 root:   /
@@ -312,6 +343,7 @@ devno:  0:37
 source: //foo.home/bar/
 target: /mnt/sounds
 fstype: cifs
+optstr: rw,relatime,unc=\\foo.home\bar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344
 VFS-optstr: rw,relatime
 FS-opstr: rw,unc=\\foo.home\bar,username=kzak,domain=SRGROUP,uid=0,noforceuid,gid=0,noforcegid,addr=192.168.111.1,posixpaths,serverino,acl,rsize=16384,wsize=57344
 root:   /
diff --git a/tests/expected/libmount/tabfiles-parse-mtab b/tests/expected/libmount/tabfiles-parse-mtab
index 9838a9cd9..d7171ea7c 100644
--- a/tests/expected/libmount/tabfiles-parse-mtab
+++ b/tests/expected/libmount/tabfiles-parse-mtab
@@ -2,56 +2,67 @@
 source: /dev/sda4
 target: /
 fstype: ext3
+optstr: rw,noatime
 VFS-optstr: rw,noatime
 ------ fs:
 source: proc
 target: /proc
 fstype: proc
+optstr: rw
 VFS-optstr: rw
 ------ fs:
 source: sysfs
 target: /sys
 fstype: sysfs
+optstr: rw
 VFS-optstr: rw
 ------ fs:
 source: devpts
 target: /dev/pts
 fstype: devpts
+optstr: rw,gid=5,mode=620
 VFS-optstr: rw
 FS-opstr: gid=5,mode=620
 ------ fs:
 source: tmpfs
 target: /dev/shm
 fstype: tmpfs
+optstr: rw
 VFS-optstr: rw
 ------ fs:
 source: /dev/sda6
 target: /boot
 fstype: ext3
+optstr: rw,noatime
 VFS-optstr: rw,noatime
 ------ fs:
 source: /dev/mapper/kzak-home
 target: /home/kzak
 fstype: ext4
+optstr: rw,noatime
 VFS-optstr: rw,noatime
 ------ fs:
 source: (null)
 target: /proc/sys/fs/binfmt_misc
 fstype: binfmt_misc
+optstr: rw
 VFS-optstr: rw
 ------ fs:
 source: fusectl
 target: /sys/fs/fuse/connections
 fstype: fusectl
+optstr: rw
 VFS-optstr: rw
 ------ fs:
 source: gvfs-fuse-daemon
 target: /home/kzak/.gvfs
 fstype: fuse.gvfs-fuse-daemon
+optstr: rw,nosuid,nodev,user=kzak
 VFS-optstr: rw,nosuid,nodev
 user-optstr: user=kzak
 ------ fs:
 source: sunrpc
 target: /var/lib/nfs/rpc_pipefs
 fstype: rpc_pipefs
+optstr: rw
 VFS-optstr: rw
diff --git a/tests/expected/libmount/tabfiles-tags-fstab-dev b/tests/expected/libmount/tabfiles-tags-fstab-dev
index 63c49c0f5..823a19cac 100644
--- a/tests/expected/libmount/tabfiles-tags-fstab-dev
+++ b/tests/expected/libmount/tabfiles-tags-fstab-dev
@@ -2,3 +2,4 @@
 
 target: /mnt/mountpoint3
 fstype: auto
+optstr: defaults
diff --git a/tests/expected/libmount/tabfiles-tags-fstab-dev2label b/tests/expected/libmount/tabfiles-tags-fstab-dev2label
index eb070b79d..78d04a4be 100644
--- a/tests/expected/libmount/tabfiles-tags-fstab-dev2label
+++ b/tests/expected/libmount/tabfiles-tags-fstab-dev2label
@@ -2,3 +2,4 @@
 source: LABEL=testLibmount
 target: /mnt/mountpoint
 fstype: auto
+optstr: defaults
diff --git a/tests/expected/libmount/tabfiles-tags-fstab-label b/tests/expected/libmount/tabfiles-tags-fstab-label
index eb070b79d..78d04a4be 100644
--- a/tests/expected/libmount/tabfiles-tags-fstab-label
+++ b/tests/expected/libmount/tabfiles-tags-fstab-label
@@ -2,3 +2,4 @@
 source: LABEL=testLibmount
 target: /mnt/mountpoint
 fstype: auto
+optstr: defaults
diff --git a/tests/expected/libmount/tabfiles-tags-fstab-label2dev b/tests/expected/libmount/tabfiles-tags-fstab-label2dev
index eb070b79d..78d04a4be 100644
--- a/tests/expected/libmount/tabfiles-tags-fstab-label2dev
+++ b/tests/expected/libmount/tabfiles-tags-fstab-label2dev
@@ -2,3 +2,4 @@
 source: LABEL=testLibmount
 target: /mnt/mountpoint
 fstype: auto
+optstr: defaults
diff --git a/tests/expected/libmount/tabfiles-tags-fstab-label2uuid b/tests/expected/libmount/tabfiles-tags-fstab-label2uuid
index eb070b79d..78d04a4be 100644
--- a/tests/expected/libmount/tabfiles-tags-fstab-label2uuid
+++ b/tests/expected/libmount/tabfiles-tags-fstab-label2uuid
@@ -2,3 +2,4 @@
 source: LABEL=testLibmount
 target: /mnt/mountpoint
 fstype: auto
+optstr: defaults
diff --git a/tests/expected/libmount/tabfiles-tags-fstab-uuid b/tests/expected/libmount/tabfiles-tags-fstab-uuid
index b3a413a07..67d4e7ba3 100644
--- a/tests/expected/libmount/tabfiles-tags-fstab-uuid
+++ b/tests/expected/libmount/tabfiles-tags-fstab-uuid
@@ -2,3 +2,4 @@
 source: UUID=de1bc6e9-34ab-4151-a1d7-900042eee8d9
 target: /mnt/mountpoint2
 fstype: auto
+optstr: defaults