summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVirendra Thakur <virendra.thakur@kpit.com>2025-05-22 17:41:41 +0530
committerSteve Sakoman <steve@sakoman.com>2025-05-28 08:46:32 -0700
commitaee1d45a8333b6261e91f2c1278474f266346e61 (patch)
tree03ad0cbce31be5d435a06ebc2c2e315fa078cbf0
parent32d2b233c6b194992c8125728d4230d748be0659 (diff)
downloadpoky-aee1d45a8333b6261e91f2c1278474f266346e61.tar.gz
util-linux: Add fix to isolate test fstab entries using CUSTOM_FSTAB
During ptest execution, util-linux adds mount entries in /etc/fstab and runs `mount -a`, which mounts all available entries from /etc/fstab. This can cause unintended mounts that are unrelated to the test, leading to incorrect test behavior. To avoid this, upstream util-linux introduced a mechanism using CUSTOM_FSTAB,which isolates test-specific fstab entries. Only entries listed in CUSTOM_FSTAB are mounted during test execution, ensuring tests do not interfere with or depend on the system's /etc/fstab. This commit backports below upstream changes to use CUSTOM_FSTAB. https://github.com/util-linux/util-linux/commit/ed3d33faff17fb702a3acfca2f9f24e69f4920de https://github.com/util-linux/util-linux/commit/b1580bd760519a2cf052f023057846e54de47484 https://github.com/util-linux/util-linux/commit/6aa8d17b6b53b86a46c5da68c02a893113130496 (From OE-Core rev: 94747fb63518bf907eb7c09fc2e146e39e235a7d) Signed-off-by: Virendra Thakur <virendra.thakur@kpit.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc1
-rw-r--r--meta/recipes-core/util-linux/util-linux/fstab-isolation.patch419
2 files changed, 420 insertions, 0 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index b9172230e7..c62c6d70c3 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -41,6 +41,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin
41 file://CVE-2024-28085-0003.patch \ 41 file://CVE-2024-28085-0003.patch \
42 file://CVE-2024-28085-0004.patch \ 42 file://CVE-2024-28085-0004.patch \
43 file://CVE-2024-28085-0005.patch \ 43 file://CVE-2024-28085-0005.patch \
44 file://fstab-isolation.patch \
44 " 45 "
45 46
46SRC_URI[sha256sum] = "634e6916ad913366c3536b6468e7844769549b99a7b2bf80314de78ab5655b83" 47SRC_URI[sha256sum] = "634e6916ad913366c3536b6468e7844769549b99a7b2bf80314de78ab5655b83"
diff --git a/meta/recipes-core/util-linux/util-linux/fstab-isolation.patch b/meta/recipes-core/util-linux/util-linux/fstab-isolation.patch
new file mode 100644
index 0000000000..6b272507f7
--- /dev/null
+++ b/meta/recipes-core/util-linux/util-linux/fstab-isolation.patch
@@ -0,0 +1,419 @@
1From 1f6d3c9fd195672987076958eefbabf395fb2df2 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
3Date: Sat, 22 Apr 2023 17:48:58 +0200
4Subject: [PATCH 1/3] tests: (functions.sh) create variable for test fstab
5 location
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
11(cherry picked from commit ed3d33faff17fb702a3acfca2f9f24e69f4920de)
12Upstream-Status: Backport [https://github.com/util-linux/util-linux/commit/ed3d33faff17fb702a3acfca2f9f24e69f4920de]
13Signed-off-by: Virendra Thakur <virendra.thakur@kpit.com>
14---
15 tests/functions.sh | 13 +++++++------
16 tests/ts/mount/fstab-broken | 2 +-
17 2 files changed, 8 insertions(+), 7 deletions(-)
18
19diff --git a/tests/functions.sh b/tests/functions.sh
20index 1699ba047..93eef8564 100644
21--- a/tests/functions.sh
22+++ b/tests/functions.sh
23@@ -351,6 +351,7 @@ function ts_init_env {
24 TS_ENABLE_UBSAN="yes"
25 fi
26
27+ TS_FSTAB="/etc/fstab"
28 BLKID_FILE="$TS_OUTDIR/${TS_TESTNAME}.blkidtab"
29
30 declare -a TS_SUID_PROGS
31@@ -789,12 +790,12 @@ function ts_is_mounted {
32 }
33
34 function ts_fstab_open {
35- echo "# <!-- util-linux test entry" >> /etc/fstab
36+ echo "# <!-- util-linux test entry" >> "$TS_FSTAB"
37 }
38
39 function ts_fstab_close {
40- echo "# -->" >> /etc/fstab
41- sync /etc/fstab 2>/dev/null
42+ echo "# -->" >> "$TS_FSTAB"
43+ sync "$TS_FSTAB" 2>/dev/null
44 }
45
46 function ts_fstab_addline {
47@@ -803,7 +804,7 @@ function ts_fstab_addline {
48 local FS=${3:-"auto"}
49 local OPT=${4:-"defaults"}
50
51- echo "$SPEC $MNT $FS $OPT 0 0" >> /etc/fstab
52+ echo "$SPEC $MNT $FS $OPT 0 0" >> "$TS_FSTAB"
53 }
54
55 function ts_fstab_lock {
56@@ -827,9 +828,9 @@ function ts_fstab_clean {
57 ba
58 }
59 s/# <!-- util-linux.*-->//;
60-/^$/d" /etc/fstab
61+/^$/d" "$TS_FSTAB"
62
63- sync /etc/fstab 2>/dev/null
64+ sync "$TS_FSTAB" 2>/dev/null
65 ts_unlock "fstab"
66 }
67
68diff --git a/tests/ts/mount/fstab-broken b/tests/ts/mount/fstab-broken
69index 947e3af7a..5ef10f889 100755
70--- a/tests/ts/mount/fstab-broken
71+++ b/tests/ts/mount/fstab-broken
72@@ -33,7 +33,7 @@ mkdir -p $MNT
73
74 ts_fstab_lock
75 ts_fstab_open
76-echo "tmpd $MNT tmpfs" >> /etc/fstab
77+echo "tmpd $MNT tmpfs" >> "$TS_FSTAB"
78 ts_fstab_close
79
80 ts_init_subtest "mount"
81--
822.34.1
83
84
85From 82e44655f33037cbcd2da6664202735d1e37d317 Mon Sep 17 00:00:00 2001
86From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
87Date: Sat, 22 Apr 2023 17:20:45 +0200
88Subject: [PATCH 2/3] tests: (functions.sh) use per-test fstab file
89MIME-Version: 1.0
90Content-Type: text/plain; charset=UTF-8
91Content-Transfer-Encoding: 8bit
92
93Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
94(cherry picked from commit 6aa8d17b6b53b86a46c5da68c02a893113130496)
95Upstream-Status: Backport [https://github.com/util-linux/util-linux/commit/6aa8d17b6b53b86a46c5da68c02a893113130496]
96Signed-off-by: Virendra Thakur <virendra.thakur@kpit.com>
97---
98 tests/functions.sh | 2 +-
99 1 file changed, 1 insertion(+), 1 deletion(-)
100
101diff --git a/tests/functions.sh b/tests/functions.sh
102index 93eef8564..4a5580712 100644
103--- a/tests/functions.sh
104+++ b/tests/functions.sh
105@@ -351,7 +351,7 @@ function ts_init_env {
106 TS_ENABLE_UBSAN="yes"
107 fi
108
109- TS_FSTAB="/etc/fstab"
110+ TS_FSTAB="$TS_OUTDIR/${TS_TESTNAME}.fstab"
111 BLKID_FILE="$TS_OUTDIR/${TS_TESTNAME}.blkidtab"
112
113 declare -a TS_SUID_PROGS
114--
1152.34.1
116
117
118From 73257404c6bee007c75b826bb1bd99e8eb6e8f9a Mon Sep 17 00:00:00 2001
119From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
120Date: Sat, 22 Apr 2023 17:34:28 +0200
121Subject: [PATCH 3/3] mount: (tests) explicitly use test fstab location
122MIME-Version: 1.0
123Content-Type: text/plain; charset=UTF-8
124Content-Transfer-Encoding: 8bit
125
126Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
127(cherry picked from commit b1580bd760519a2cf052f023057846e54de47484)
128Upstream-Status: Backport [https://github.com/util-linux/util-linux/commit/b1580bd760519a2cf052f023057846e54de47484]
129Signed-off-by: Virendra Thakur <virendra.thakur@kpit.com>
130---
131 tests/ts/mount/fslists | 2 +-
132 tests/ts/mount/fstab-broken | 4 ++--
133 tests/ts/mount/fstab-btrfs | 8 ++++----
134 tests/ts/mount/fstab-devname | 4 ++--
135 tests/ts/mount/fstab-devname2label | 2 +-
136 tests/ts/mount/fstab-devname2uuid | 2 +-
137 tests/ts/mount/fstab-label | 6 +++---
138 tests/ts/mount/fstab-label2devname | 4 ++--
139 tests/ts/mount/fstab-label2uuid | 4 ++--
140 tests/ts/mount/fstab-loop | 4 ++--
141 tests/ts/mount/fstab-none | 2 +-
142 tests/ts/mount/fstab-symlink | 2 +-
143 tests/ts/mount/fstab-uuid | 4 ++--
144 tests/ts/mount/fstab-uuid2devname | 4 ++--
145 tests/ts/mount/fstab-uuid2label | 4 ++--
146 15 files changed, 28 insertions(+), 28 deletions(-)
147
148diff --git a/tests/ts/mount/fslists b/tests/ts/mount/fslists
149index 74a87f6a7..3e2efa0db 100755
150--- a/tests/ts/mount/fslists
151+++ b/tests/ts/mount/fslists
152@@ -61,7 +61,7 @@ ts_finalize_subtest
153 ts_init_subtest "more-types-fstab"
154 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
155 ts_fstab_add $DEVICE $TS_MOUNTPOINT "foo,bar,ext2"
156-$TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
157+$TS_CMD_MOUNT -T "$TS_FSTAB" $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
158 ts_fstab_clean
159 ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts"
160 $TS_CMD_UMOUNT $TS_MOUNTPOINT
161diff --git a/tests/ts/mount/fstab-broken b/tests/ts/mount/fstab-broken
162index 5ef10f889..a9855f06f 100755
163--- a/tests/ts/mount/fstab-broken
164+++ b/tests/ts/mount/fstab-broken
165@@ -37,7 +37,7 @@ echo "tmpd $MNT tmpfs" >> "$TS_FSTAB"
166 ts_fstab_close
167
168 ts_init_subtest "mount"
169-$TS_CMD_MOUNT $MNT &> /dev/null
170+$TS_CMD_MOUNT -T "$TS_FSTAB" $MNT &> /dev/null
171 [ "$?" = "0" ] || ts_log "error: mount $MNT"
172 $TS_CMD_FINDMNT --kernel --mountpoint "$MNT" &> /dev/null
173 if [ "$?" != "0" ]; then
174@@ -56,7 +56,7 @@ ts_finalize_subtest
175
176
177 ts_init_subtest "mount-all"
178-$TS_CMD_MOUNT -a &> /dev/null
179+$TS_CMD_MOUNT -T "$TS_FSTAB" -a &> /dev/null
180 [ "$?" = "0" ] || ts_log "error: mount -a"
181 $TS_CMD_FINDMNT --kernel --mountpoint "$MNT" &> /dev/null
182 if [ "$?" != "0" ]; then
183diff --git a/tests/ts/mount/fstab-btrfs b/tests/ts/mount/fstab-btrfs
184index 0003b5d65..1f93d409d 100755
185--- a/tests/ts/mount/fstab-btrfs
186+++ b/tests/ts/mount/fstab-btrfs
187@@ -91,8 +91,8 @@ ts_fstab_addline "$DEVICE" "$TS_MOUNTPOINT_SUBVOLID" "btrfs" "subvolid=$NON_DEFA
188 ts_fstab_addline "$TS_MOUNTPOINT_SUBVOLID" "$TS_MOUNTPOINT_BIND" "auto" "bind"
189 ts_fstab_close
190
191-$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>> $TS_ERRLOG
192-$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>> $TS_ERRLOG
193+$TS_CMD_MOUNT -T "$TS_FSTAB" -a >> $TS_OUTPUT 2>> $TS_ERRLOG
194+$TS_CMD_MOUNT -T "$TS_FSTAB" -a >> $TS_OUTPUT 2>> $TS_ERRLOG
195
196 $TS_CMD_UMOUNT "$TS_MOUNTPOINT_BIND" >> $TS_OUTPUT 2>> $TS_ERRLOG
197 $TS_CMD_UMOUNT "$TS_MOUNTPOINT_DEFAULT" >> $TS_OUTPUT 2>> $TS_ERRLOG
198@@ -121,8 +121,8 @@ ts_fstab_addline "$DEVICE" "$TS_MOUNTPOINT_SUBVOLID" "auto" "subvolid=$NON_DEFAU
199 ts_fstab_addline "$TS_MOUNTPOINT_SUBVOL/bind-mnt" "$TS_MOUNTPOINT_BIND" "auto" "bind"
200 ts_fstab_close
201
202-$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>> $TS_ERRLOG
203-$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>> $TS_ERRLOG
204+$TS_CMD_MOUNT -T "$TS_FSTAB" -a >> $TS_OUTPUT 2>> $TS_ERRLOG
205+$TS_CMD_MOUNT -T "$TS_FSTAB" -a >> $TS_OUTPUT 2>> $TS_ERRLOG
206
207 $TS_CMD_UMOUNT "$TS_MOUNTPOINT_BIND" >> $TS_OUTPUT 2>> $TS_ERRLOG
208 $TS_CMD_UMOUNT "$TS_MOUNTPOINT_DEFAULT" >> $TS_OUTPUT 2>> $TS_ERRLOG
209diff --git a/tests/ts/mount/fstab-devname b/tests/ts/mount/fstab-devname
210index 4e4961ede..3964b81c5 100755
211--- a/tests/ts/mount/fstab-devname
212+++ b/tests/ts/mount/fstab-devname
213@@ -40,12 +40,12 @@ ts_device_has "TYPE" "ext2" $DEVICE || ts_die "Cannot find ext2 on $DEVICE"
214 ts_fstab_add $DEVICE
215
216 # variant A)
217-$TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
218+$TS_CMD_MOUNT -T "$TS_FSTAB" $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
219 ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts"
220 $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE"
221
222 # variant B)
223-$TS_CMD_MOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
224+$TS_CMD_MOUNT -T "$TS_FSTAB" $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
225 ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts"
226 $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE"
227
228diff --git a/tests/ts/mount/fstab-devname2label b/tests/ts/mount/fstab-devname2label
229index 7257fbc89..1f50d0178 100755
230--- a/tests/ts/mount/fstab-devname2label
231+++ b/tests/ts/mount/fstab-devname2label
232@@ -41,7 +41,7 @@ ts_device_has "LABEL" $LABEL $DEVICE \
233 ts_fstab_add "LABEL=$LABEL"
234 ts_udevadm_settle "$DEVICE" "LABEL"
235
236-$TS_CMD_MOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
237+$TS_CMD_MOUNT -T "$TS_FSTAB" $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
238 ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts"
239 $TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE"
240
241diff --git a/tests/ts/mount/fstab-devname2uuid b/tests/ts/mount/fstab-devname2uuid
242index 02b3ee161..f1fa23152 100755
243--- a/tests/ts/mount/fstab-devname2uuid
244+++ b/tests/ts/mount/fstab-devname2uuid
245@@ -39,7 +39,7 @@ UUID=$(ts_uuid_by_devname "$DEVICE") || ts_die "Cannot find UUID on $DEVICE"
246 ts_fstab_add "UUID=$UUID"
247 ts_udevadm_settle "$DEVICE" "UUID"
248
249-$TS_CMD_MOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
250+$TS_CMD_MOUNT -T "$TS_FSTAB" $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG
251 ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts"
252 $TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE"
253
254diff --git a/tests/ts/mount/fstab-label b/tests/ts/mount/fstab-label
255index a86bdf6c0..6dd1c7bfc 100755
256--- a/tests/ts/mount/fstab-label
257+++ b/tests/ts/mount/fstab-label
258@@ -42,17 +42,17 @@ ts_fstab_add "LABEL=$LABEL"
259 ts_udevadm_settle "$DEVICE" "LABEL"
260
261 # variant A)
262-$TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
263+$TS_CMD_MOUNT -T "$TS_FSTAB" $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
264 ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts"
265 $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE"
266
267 # variant B)
268-$TS_CMD_MOUNT -L $LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG
269+$TS_CMD_MOUNT -T "$TS_FSTAB" -L $LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG
270 ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts"
271 $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE"
272
273 # variant C)
274-$TS_CMD_MOUNT LABEL=$LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG
275+$TS_CMD_MOUNT -T "$TS_FSTAB" LABEL=$LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG
276 ts_is_mounted $DEVICE || ts_die "C) Cannot find $DEVICE in /proc/mounts"
277 $TS_CMD_UMOUNT $DEVICE || ts_die "C) Cannot umount $DEVICE"
278
279diff --git a/tests/ts/mount/fstab-label2devname b/tests/ts/mount/fstab-label2devname
280index 181352aef..359479aaa 100755
281--- a/tests/ts/mount/fstab-label2devname
282+++ b/tests/ts/mount/fstab-label2devname
283@@ -42,12 +42,12 @@ ts_fstab_add "$DEVICE"
284 ts_udevadm_settle "$DEVICE" "LABEL"
285
286 # variant A)
287-$TS_CMD_MOUNT -L $LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG
288+$TS_CMD_MOUNT -T "$TS_FSTAB" -L $LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG
289 ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts"
290 $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE"
291
292 # variant B)
293-$TS_CMD_MOUNT "LABEL=$LABEL" >> $TS_OUTPUT 2>> $TS_ERRLOG
294+$TS_CMD_MOUNT -T "$TS_FSTAB" "LABEL=$LABEL" >> $TS_OUTPUT 2>> $TS_ERRLOG
295 ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts"
296 $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE"
297
298diff --git a/tests/ts/mount/fstab-label2uuid b/tests/ts/mount/fstab-label2uuid
299index 027bf8059..5884faeed 100755
300--- a/tests/ts/mount/fstab-label2uuid
301+++ b/tests/ts/mount/fstab-label2uuid
302@@ -44,12 +44,12 @@ ts_fstab_add "UUID=$UUID"
303 ts_udevadm_settle "$DEVICE" "LABEL" "UUID"
304
305 # variant A)
306-$TS_CMD_MOUNT -L $LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG
307+$TS_CMD_MOUNT -T "$TS_FSTAB" -L $LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG
308 ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts"
309 $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE"
310
311 # variant B)
312-$TS_CMD_MOUNT "LABEL=$LABEL" >> $TS_OUTPUT 2>> $TS_ERRLOG
313+$TS_CMD_MOUNT -T "$TS_FSTAB" "LABEL=$LABEL" >> $TS_OUTPUT 2>> $TS_ERRLOG
314 ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts"
315 $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE"
316
317diff --git a/tests/ts/mount/fstab-loop b/tests/ts/mount/fstab-loop
318index 7d4fbff3c..29ceb937d 100755
319--- a/tests/ts/mount/fstab-loop
320+++ b/tests/ts/mount/fstab-loop
321@@ -39,10 +39,10 @@ ts_fstab_lock
322 ts_fstab_open
323
324 ts_fstab_addline "$IMG" "$TS_MOUNTPOINT-1" "ext2" "loop"
325-$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>> $TS_ERRLOG
326+$TS_CMD_MOUNT -T "$TS_FSTAB" -a >> $TS_OUTPUT 2>> $TS_ERRLOG
327
328 ts_fstab_addline "$IMG" "$TS_MOUNTPOINT-2" "ext2" "loop"
329-$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>> $TS_ERRLOG
330+$TS_CMD_MOUNT -T "$TS_FSTAB" -a >> $TS_OUTPUT 2>> $TS_ERRLOG
331
332 ts_fstab_close
333
334diff --git a/tests/ts/mount/fstab-none b/tests/ts/mount/fstab-none
335index e2ed0af02..4d1ec283b 100755
336--- a/tests/ts/mount/fstab-none
337+++ b/tests/ts/mount/fstab-none
338@@ -16,7 +16,7 @@ ts_fstab_add "none" "$TS_MOUNTPOINT" "tmpfs" "rw,nosuid,nodev,relatime"
339
340 mkdir -p $TS_MOUNTPOINT
341
342-$TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
343+$TS_CMD_MOUNT -T "$TS_FSTAB" $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
344 [ "$?" = "0" ] || ts_log "error: mount $TS_MOUNTPOINT"
345
346 $TS_CMD_FINDMNT --mountpoint "$TS_MOUNTPOINT" &> /dev/null
347diff --git a/tests/ts/mount/fstab-symlink b/tests/ts/mount/fstab-symlink
348index 9f63a5afc..e00b33d61 100755
349--- a/tests/ts/mount/fstab-symlink
350+++ b/tests/ts/mount/fstab-symlink
351@@ -46,7 +46,7 @@ ln -s $DEVICE $LINKNAME
352 ts_fstab_add $LINKNAME $TS_MOUNTPOINT "auto" "defaults,user"
353
354 # variant A) -- UID=0
355-$TS_CMD_MOUNT $LINKNAME >> $TS_OUTPUT 2>> $TS_ERRLOG
356+$TS_CMD_MOUNT -T "$TS_FSTAB" $LINKNAME >> $TS_OUTPUT 2>> $TS_ERRLOG
357 ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts"
358 $TS_CMD_UMOUNT $LINKNAME || ts_die "A) Cannot umount $LINKNAME"
359
360diff --git a/tests/ts/mount/fstab-uuid b/tests/ts/mount/fstab-uuid
361index ce4c86ea8..45694c9f3 100755
362--- a/tests/ts/mount/fstab-uuid
363+++ b/tests/ts/mount/fstab-uuid
364@@ -40,12 +40,12 @@ ts_fstab_add "UUID=$UUID"
365 ts_udevadm_settle "$DEVICE" "UUID"
366
367 # variant A)
368-$TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
369+$TS_CMD_MOUNT -T "$TS_FSTAB" $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
370 ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts"
371 $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE"
372
373 # variant B)
374-$TS_CMD_MOUNT -U $UUID >> $TS_OUTPUT 2>> $TS_ERRLOG
375+$TS_CMD_MOUNT -T "$TS_FSTAB" -U $UUID >> $TS_OUTPUT 2>> $TS_ERRLOG
376 ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts"
377 $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE"
378
379diff --git a/tests/ts/mount/fstab-uuid2devname b/tests/ts/mount/fstab-uuid2devname
380index 4ce72556c..82367235f 100755
381--- a/tests/ts/mount/fstab-uuid2devname
382+++ b/tests/ts/mount/fstab-uuid2devname
383@@ -40,12 +40,12 @@ ts_fstab_add "$DEVICE"
384 ts_udevadm_settle "$DEVICE" "UUID"
385
386 # variant A)
387-$TS_CMD_MOUNT -U $UUID >> $TS_OUTPUT 2>> $TS_ERRLOG
388+$TS_CMD_MOUNT -T "$TS_FSTAB" -U $UUID >> $TS_OUTPUT 2>> $TS_ERRLOG
389 ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts"
390 $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE"
391
392 # variant B)
393-$TS_CMD_MOUNT "UUID=$UUID" >> $TS_OUTPUT 2>> $TS_ERRLOG
394+$TS_CMD_MOUNT -T "$TS_FSTAB" "UUID=$UUID" >> $TS_OUTPUT 2>> $TS_ERRLOG
395 ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts"
396 $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE"
397
398diff --git a/tests/ts/mount/fstab-uuid2label b/tests/ts/mount/fstab-uuid2label
399index b1f983df1..1a2ffaada 100755
400--- a/tests/ts/mount/fstab-uuid2label
401+++ b/tests/ts/mount/fstab-uuid2label
402@@ -43,12 +43,12 @@ ts_fstab_add "LABEL=$LABEL"
403 ts_udevadm_settle "$DEVICE" "LABEL" "UUID"
404
405 # variant A)
406-$TS_CMD_MOUNT -U $UUID >> $TS_OUTPUT 2>> $TS_ERRLOG
407+$TS_CMD_MOUNT -T "$TS_FSTAB" -U $UUID >> $TS_OUTPUT 2>> $TS_ERRLOG
408 ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts"
409 $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE"
410
411 # variant B)
412-$TS_CMD_MOUNT "UUID=$UUID" >> $TS_OUTPUT 2>> $TS_ERRLOG
413+$TS_CMD_MOUNT -T "$TS_FSTAB" "UUID=$UUID" >> $TS_OUTPUT 2>> $TS_ERRLOG
414 ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts"
415 $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE"
416
417--
4182.34.1
419
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-06-14 09:33:48 +0000