From patchwork Thu May 22 12:11:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Virendra Thakur X-Patchwork-Id: 63511 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1E70C54E90 for ; Thu, 22 May 2025 12:16:19 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mx.groups.io with SMTP id smtpd.web11.22655.1747916177033925120 for ; Thu, 22 May 2025 05:16:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ELRxG2SD; spf=pass (domain: gmail.com, ip: 209.85.216.53, mailfrom: thakur.virendra1810@gmail.com) Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-310e1f4627aso50750a91.2 for ; Thu, 22 May 2025 05:16:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747916176; x=1748520976; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=bcnjYAKy8Xdz6SCMatkuB3wq38jACQBwZN3IDrYbFWU=; b=ELRxG2SDLbDEbWHcnQ1tNlYjxUQrQC0ubJTXDoD8+CB/z/XXbY0a+n5Q29hALdjA/E j2gmI8gILYP5a4tUbsk1PvNnW7ccy+vRHyCy1FmIlywJQnfyqbwLFlGrKpbHM073spAe vmOwnVFKfoyMAEc37vpe812hYNiYHSP7qyBy8vapVldh9hG0VZlEXtjZoKuh1M3pbcXA /4rsbkG3l2l3AL9WlNVd+fystcrVCmPdPZEt2bhWl0I14yWLGUc3N7191sKetJLPc9yb CmccAcsTZolU0tTVFXroE0APjh/M5AF9tIsFhrAAIJ3HzpdwlDQ07SuabkV+SmGGZwBO oNZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747916176; x=1748520976; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=bcnjYAKy8Xdz6SCMatkuB3wq38jACQBwZN3IDrYbFWU=; b=DXKOD4YQiBzpI8/uqy0q13F2v174zeI+GYnLTm16keQvjETQjqIusFpxajDLNwxWfS H82utKrcrIuD2PYkCBlTpswb1qVnbd5JIlkALDcYdBz88lHi+otQ1Fnfzv3f+406dXCv pZUIH0h54Y0y8k29aipXZyFXTkM8YgRmWsWRgh2IutfMNadFhdR3Onl/wa9h7vKCjaZM /1zmEs21wu04/uiNlkSPc80E/U69FnbBf4XhTne2WvGsCpeF4qnu/GG4+WFXVhth+qVq w8qWEB8zP6qhAicQf2rxSnJjOkiSDbZC85zKRzgJ8j2nDvfLMK9EAK/11QPUHCAN7vQ4 s7lA== X-Gm-Message-State: AOJu0YzqOODVZxVgFRWWjmkKZ1SmeR3Sk71kW6ENG/uSW3V90OYLe1x/ Pp2T3T1281NGQCrcrww1WWJ4OWqV3B0rWmc0KL/VKTiM0mhMJRyX2C7Eq0IE4A== X-Gm-Gg: ASbGnct9DwN6w1k2JV/54Qnat2+kanDAWFRdC0QNxr48nLjVtaJ2feHz/RQLjqXx6XD gx1eoXlV+27E9f2e98V+SypzZ223SiY7BTDHyFeJOOodEnjEH4JWTYW2hJz72FP+aM0M2x00QJJ tr34b6Ns5p8b+9fhKXSm7bqTGQ5hocfv01TAPBCbXJ1JZigx7W4TUYYWOtpcwhy+w6kW0eZqkcU 6uR2D9QJ7DCdUO7gM4JAPdF/saHb6Lxf0KWYUp8zNLK7yvucqs1Gc5PF5n+mRBkjVAcX3ncsNqN 78JjWHkhqA8Fvm35gnLfbhhY/YwpTVTgpPpHvkKV3YTxcM95M4EI/baOJRJ1g6QOaJV1pMk= X-Google-Smtp-Source: AGHT+IGWf1PZSckCL9njIYxebxAJln/eNNv/HZmtccRxOlfKZq7iD9BqV4ojY6iF3ibKRYiOs9POYA== X-Received: by 2002:a17:90b:4b82:b0:2ff:6f88:b04a with SMTP id 98e67ed59e1d1-30e8314d95bmr36145145a91.15.1747916175925; Thu, 22 May 2025 05:16:15 -0700 (PDT) Received: from LL-3020L.kpit.com ([103.170.68.39]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30f36513bb7sm5434920a91.46.2025.05.22.05.16.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 05:16:15 -0700 (PDT) From: Virendra Thakur To: openembedded-core@lists.openembedded.org Cc: Qi.Chen@windriver.com, Virendra Thakur Subject: [OE-core][kirkstone][PATCH] util-linux: Add fix to isolate test fstab entries using CUSTOM_FSTAB Date: Thu, 22 May 2025 17:41:41 +0530 Message-Id: <20250522121141.1272703-1-thakur.virendra1810@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 22 May 2025 12:16:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217092 From: Virendra Thakur 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 Signed-off-by: Virendra Thakur --- meta/recipes-core/util-linux/util-linux.inc | 1 + .../util-linux/fstab-isolation.patch | 419 ++++++++++++++++++ 2 files changed, 420 insertions(+) create mode 100644 meta/recipes-core/util-linux/util-linux/fstab-isolation.patch 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 file://CVE-2024-28085-0003.patch \ file://CVE-2024-28085-0004.patch \ file://CVE-2024-28085-0005.patch \ + file://fstab-isolation.patch \ " SRC_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 @@ +From 1f6d3c9fd195672987076958eefbabf395fb2df2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= +Date: Sat, 22 Apr 2023 17:48:58 +0200 +Subject: [PATCH 1/3] tests: (functions.sh) create variable for test fstab + location +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Thomas Weißschuh +(cherry picked from commit ed3d33faff17fb702a3acfca2f9f24e69f4920de) +Upstream-Status: Backport [https://github.com/util-linux/util-linux/commit/ed3d33faff17fb702a3acfca2f9f24e69f4920de] +Signed-off-by: Virendra Thakur +--- + tests/functions.sh | 13 +++++++------ + tests/ts/mount/fstab-broken | 2 +- + 2 files changed, 8 insertions(+), 7 deletions(-) + +diff --git a/tests/functions.sh b/tests/functions.sh +index 1699ba047..93eef8564 100644 +--- a/tests/functions.sh ++++ b/tests/functions.sh +@@ -351,6 +351,7 @@ function ts_init_env { + TS_ENABLE_UBSAN="yes" + fi + ++ TS_FSTAB="/etc/fstab" + BLKID_FILE="$TS_OUTDIR/${TS_TESTNAME}.blkidtab" + + declare -a TS_SUID_PROGS +@@ -789,12 +790,12 @@ function ts_is_mounted { + } + + function ts_fstab_open { +- echo "# " >> /etc/fstab +- sync /etc/fstab 2>/dev/null ++ echo "# -->" >> "$TS_FSTAB" ++ sync "$TS_FSTAB" 2>/dev/null + } + + function ts_fstab_addline { +@@ -803,7 +804,7 @@ function ts_fstab_addline { + local FS=${3:-"auto"} + local OPT=${4:-"defaults"} + +- echo "$SPEC $MNT $FS $OPT 0 0" >> /etc/fstab ++ echo "$SPEC $MNT $FS $OPT 0 0" >> "$TS_FSTAB" + } + + function ts_fstab_lock { +@@ -827,9 +828,9 @@ function ts_fstab_clean { + ba + } + s/# //; +-/^$/d" /etc/fstab ++/^$/d" "$TS_FSTAB" + +- sync /etc/fstab 2>/dev/null ++ sync "$TS_FSTAB" 2>/dev/null + ts_unlock "fstab" + } + +diff --git a/tests/ts/mount/fstab-broken b/tests/ts/mount/fstab-broken +index 947e3af7a..5ef10f889 100755 +--- a/tests/ts/mount/fstab-broken ++++ b/tests/ts/mount/fstab-broken +@@ -33,7 +33,7 @@ mkdir -p $MNT + + ts_fstab_lock + ts_fstab_open +-echo "tmpd $MNT tmpfs" >> /etc/fstab ++echo "tmpd $MNT tmpfs" >> "$TS_FSTAB" + ts_fstab_close + + ts_init_subtest "mount" +-- +2.34.1 + + +From 82e44655f33037cbcd2da6664202735d1e37d317 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= +Date: Sat, 22 Apr 2023 17:20:45 +0200 +Subject: [PATCH 2/3] tests: (functions.sh) use per-test fstab file +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Thomas Weißschuh +(cherry picked from commit 6aa8d17b6b53b86a46c5da68c02a893113130496) +Upstream-Status: Backport [https://github.com/util-linux/util-linux/commit/6aa8d17b6b53b86a46c5da68c02a893113130496] +Signed-off-by: Virendra Thakur +--- + tests/functions.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/functions.sh b/tests/functions.sh +index 93eef8564..4a5580712 100644 +--- a/tests/functions.sh ++++ b/tests/functions.sh +@@ -351,7 +351,7 @@ function ts_init_env { + TS_ENABLE_UBSAN="yes" + fi + +- TS_FSTAB="/etc/fstab" ++ TS_FSTAB="$TS_OUTDIR/${TS_TESTNAME}.fstab" + BLKID_FILE="$TS_OUTDIR/${TS_TESTNAME}.blkidtab" + + declare -a TS_SUID_PROGS +-- +2.34.1 + + +From 73257404c6bee007c75b826bb1bd99e8eb6e8f9a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= +Date: Sat, 22 Apr 2023 17:34:28 +0200 +Subject: [PATCH 3/3] mount: (tests) explicitly use test fstab location +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Thomas Weißschuh +(cherry picked from commit b1580bd760519a2cf052f023057846e54de47484) +Upstream-Status: Backport [https://github.com/util-linux/util-linux/commit/b1580bd760519a2cf052f023057846e54de47484] +Signed-off-by: Virendra Thakur +--- + tests/ts/mount/fslists | 2 +- + tests/ts/mount/fstab-broken | 4 ++-- + tests/ts/mount/fstab-btrfs | 8 ++++---- + tests/ts/mount/fstab-devname | 4 ++-- + tests/ts/mount/fstab-devname2label | 2 +- + tests/ts/mount/fstab-devname2uuid | 2 +- + tests/ts/mount/fstab-label | 6 +++--- + tests/ts/mount/fstab-label2devname | 4 ++-- + tests/ts/mount/fstab-label2uuid | 4 ++-- + tests/ts/mount/fstab-loop | 4 ++-- + tests/ts/mount/fstab-none | 2 +- + tests/ts/mount/fstab-symlink | 2 +- + tests/ts/mount/fstab-uuid | 4 ++-- + tests/ts/mount/fstab-uuid2devname | 4 ++-- + tests/ts/mount/fstab-uuid2label | 4 ++-- + 15 files changed, 28 insertions(+), 28 deletions(-) + +diff --git a/tests/ts/mount/fslists b/tests/ts/mount/fslists +index 74a87f6a7..3e2efa0db 100755 +--- a/tests/ts/mount/fslists ++++ b/tests/ts/mount/fslists +@@ -61,7 +61,7 @@ ts_finalize_subtest + ts_init_subtest "more-types-fstab" + [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT + ts_fstab_add $DEVICE $TS_MOUNTPOINT "foo,bar,ext2" +-$TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_MOUNT -T "$TS_FSTAB" $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG + ts_fstab_clean + ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" + $TS_CMD_UMOUNT $TS_MOUNTPOINT +diff --git a/tests/ts/mount/fstab-broken b/tests/ts/mount/fstab-broken +index 5ef10f889..a9855f06f 100755 +--- a/tests/ts/mount/fstab-broken ++++ b/tests/ts/mount/fstab-broken +@@ -37,7 +37,7 @@ echo "tmpd $MNT tmpfs" >> "$TS_FSTAB" + ts_fstab_close + + ts_init_subtest "mount" +-$TS_CMD_MOUNT $MNT &> /dev/null ++$TS_CMD_MOUNT -T "$TS_FSTAB" $MNT &> /dev/null + [ "$?" = "0" ] || ts_log "error: mount $MNT" + $TS_CMD_FINDMNT --kernel --mountpoint "$MNT" &> /dev/null + if [ "$?" != "0" ]; then +@@ -56,7 +56,7 @@ ts_finalize_subtest + + + ts_init_subtest "mount-all" +-$TS_CMD_MOUNT -a &> /dev/null ++$TS_CMD_MOUNT -T "$TS_FSTAB" -a &> /dev/null + [ "$?" = "0" ] || ts_log "error: mount -a" + $TS_CMD_FINDMNT --kernel --mountpoint "$MNT" &> /dev/null + if [ "$?" != "0" ]; then +diff --git a/tests/ts/mount/fstab-btrfs b/tests/ts/mount/fstab-btrfs +index 0003b5d65..1f93d409d 100755 +--- a/tests/ts/mount/fstab-btrfs ++++ b/tests/ts/mount/fstab-btrfs +@@ -91,8 +91,8 @@ ts_fstab_addline "$DEVICE" "$TS_MOUNTPOINT_SUBVOLID" "btrfs" "subvolid=$NON_DEFA + ts_fstab_addline "$TS_MOUNTPOINT_SUBVOLID" "$TS_MOUNTPOINT_BIND" "auto" "bind" + ts_fstab_close + +-$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>> $TS_ERRLOG +-$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_MOUNT -T "$TS_FSTAB" -a >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_MOUNT -T "$TS_FSTAB" -a >> $TS_OUTPUT 2>> $TS_ERRLOG + + $TS_CMD_UMOUNT "$TS_MOUNTPOINT_BIND" >> $TS_OUTPUT 2>> $TS_ERRLOG + $TS_CMD_UMOUNT "$TS_MOUNTPOINT_DEFAULT" >> $TS_OUTPUT 2>> $TS_ERRLOG +@@ -121,8 +121,8 @@ ts_fstab_addline "$DEVICE" "$TS_MOUNTPOINT_SUBVOLID" "auto" "subvolid=$NON_DEFAU + ts_fstab_addline "$TS_MOUNTPOINT_SUBVOL/bind-mnt" "$TS_MOUNTPOINT_BIND" "auto" "bind" + ts_fstab_close + +-$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>> $TS_ERRLOG +-$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_MOUNT -T "$TS_FSTAB" -a >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_MOUNT -T "$TS_FSTAB" -a >> $TS_OUTPUT 2>> $TS_ERRLOG + + $TS_CMD_UMOUNT "$TS_MOUNTPOINT_BIND" >> $TS_OUTPUT 2>> $TS_ERRLOG + $TS_CMD_UMOUNT "$TS_MOUNTPOINT_DEFAULT" >> $TS_OUTPUT 2>> $TS_ERRLOG +diff --git a/tests/ts/mount/fstab-devname b/tests/ts/mount/fstab-devname +index 4e4961ede..3964b81c5 100755 +--- a/tests/ts/mount/fstab-devname ++++ b/tests/ts/mount/fstab-devname +@@ -40,12 +40,12 @@ ts_device_has "TYPE" "ext2" $DEVICE || ts_die "Cannot find ext2 on $DEVICE" + ts_fstab_add $DEVICE + + # variant A) +-$TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_MOUNT -T "$TS_FSTAB" $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG + ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" + $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" + + # variant B) +-$TS_CMD_MOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_MOUNT -T "$TS_FSTAB" $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG + ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" + $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" + +diff --git a/tests/ts/mount/fstab-devname2label b/tests/ts/mount/fstab-devname2label +index 7257fbc89..1f50d0178 100755 +--- a/tests/ts/mount/fstab-devname2label ++++ b/tests/ts/mount/fstab-devname2label +@@ -41,7 +41,7 @@ ts_device_has "LABEL" $LABEL $DEVICE \ + ts_fstab_add "LABEL=$LABEL" + ts_udevadm_settle "$DEVICE" "LABEL" + +-$TS_CMD_MOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_MOUNT -T "$TS_FSTAB" $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG + ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" + $TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE" + +diff --git a/tests/ts/mount/fstab-devname2uuid b/tests/ts/mount/fstab-devname2uuid +index 02b3ee161..f1fa23152 100755 +--- a/tests/ts/mount/fstab-devname2uuid ++++ b/tests/ts/mount/fstab-devname2uuid +@@ -39,7 +39,7 @@ UUID=$(ts_uuid_by_devname "$DEVICE") || ts_die "Cannot find UUID on $DEVICE" + ts_fstab_add "UUID=$UUID" + ts_udevadm_settle "$DEVICE" "UUID" + +-$TS_CMD_MOUNT $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_MOUNT -T "$TS_FSTAB" $DEVICE >> $TS_OUTPUT 2>> $TS_ERRLOG + ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" + $TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE" + +diff --git a/tests/ts/mount/fstab-label b/tests/ts/mount/fstab-label +index a86bdf6c0..6dd1c7bfc 100755 +--- a/tests/ts/mount/fstab-label ++++ b/tests/ts/mount/fstab-label +@@ -42,17 +42,17 @@ ts_fstab_add "LABEL=$LABEL" + ts_udevadm_settle "$DEVICE" "LABEL" + + # variant A) +-$TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_MOUNT -T "$TS_FSTAB" $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG + ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" + $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" + + # variant B) +-$TS_CMD_MOUNT -L $LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_MOUNT -T "$TS_FSTAB" -L $LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG + ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" + $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" + + # variant C) +-$TS_CMD_MOUNT LABEL=$LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_MOUNT -T "$TS_FSTAB" LABEL=$LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG + ts_is_mounted $DEVICE || ts_die "C) Cannot find $DEVICE in /proc/mounts" + $TS_CMD_UMOUNT $DEVICE || ts_die "C) Cannot umount $DEVICE" + +diff --git a/tests/ts/mount/fstab-label2devname b/tests/ts/mount/fstab-label2devname +index 181352aef..359479aaa 100755 +--- a/tests/ts/mount/fstab-label2devname ++++ b/tests/ts/mount/fstab-label2devname +@@ -42,12 +42,12 @@ ts_fstab_add "$DEVICE" + ts_udevadm_settle "$DEVICE" "LABEL" + + # variant A) +-$TS_CMD_MOUNT -L $LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_MOUNT -T "$TS_FSTAB" -L $LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG + ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" + $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" + + # variant B) +-$TS_CMD_MOUNT "LABEL=$LABEL" >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_MOUNT -T "$TS_FSTAB" "LABEL=$LABEL" >> $TS_OUTPUT 2>> $TS_ERRLOG + ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" + $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" + +diff --git a/tests/ts/mount/fstab-label2uuid b/tests/ts/mount/fstab-label2uuid +index 027bf8059..5884faeed 100755 +--- a/tests/ts/mount/fstab-label2uuid ++++ b/tests/ts/mount/fstab-label2uuid +@@ -44,12 +44,12 @@ ts_fstab_add "UUID=$UUID" + ts_udevadm_settle "$DEVICE" "LABEL" "UUID" + + # variant A) +-$TS_CMD_MOUNT -L $LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_MOUNT -T "$TS_FSTAB" -L $LABEL >> $TS_OUTPUT 2>> $TS_ERRLOG + ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" + $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" + + # variant B) +-$TS_CMD_MOUNT "LABEL=$LABEL" >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_MOUNT -T "$TS_FSTAB" "LABEL=$LABEL" >> $TS_OUTPUT 2>> $TS_ERRLOG + ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" + $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" + +diff --git a/tests/ts/mount/fstab-loop b/tests/ts/mount/fstab-loop +index 7d4fbff3c..29ceb937d 100755 +--- a/tests/ts/mount/fstab-loop ++++ b/tests/ts/mount/fstab-loop +@@ -39,10 +39,10 @@ ts_fstab_lock + ts_fstab_open + + ts_fstab_addline "$IMG" "$TS_MOUNTPOINT-1" "ext2" "loop" +-$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_MOUNT -T "$TS_FSTAB" -a >> $TS_OUTPUT 2>> $TS_ERRLOG + + ts_fstab_addline "$IMG" "$TS_MOUNTPOINT-2" "ext2" "loop" +-$TS_CMD_MOUNT -a >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_MOUNT -T "$TS_FSTAB" -a >> $TS_OUTPUT 2>> $TS_ERRLOG + + ts_fstab_close + +diff --git a/tests/ts/mount/fstab-none b/tests/ts/mount/fstab-none +index e2ed0af02..4d1ec283b 100755 +--- a/tests/ts/mount/fstab-none ++++ b/tests/ts/mount/fstab-none +@@ -16,7 +16,7 @@ ts_fstab_add "none" "$TS_MOUNTPOINT" "tmpfs" "rw,nosuid,nodev,relatime" + + mkdir -p $TS_MOUNTPOINT + +-$TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_MOUNT -T "$TS_FSTAB" $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG + [ "$?" = "0" ] || ts_log "error: mount $TS_MOUNTPOINT" + + $TS_CMD_FINDMNT --mountpoint "$TS_MOUNTPOINT" &> /dev/null +diff --git a/tests/ts/mount/fstab-symlink b/tests/ts/mount/fstab-symlink +index 9f63a5afc..e00b33d61 100755 +--- a/tests/ts/mount/fstab-symlink ++++ b/tests/ts/mount/fstab-symlink +@@ -46,7 +46,7 @@ ln -s $DEVICE $LINKNAME + ts_fstab_add $LINKNAME $TS_MOUNTPOINT "auto" "defaults,user" + + # variant A) -- UID=0 +-$TS_CMD_MOUNT $LINKNAME >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_MOUNT -T "$TS_FSTAB" $LINKNAME >> $TS_OUTPUT 2>> $TS_ERRLOG + ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" + $TS_CMD_UMOUNT $LINKNAME || ts_die "A) Cannot umount $LINKNAME" + +diff --git a/tests/ts/mount/fstab-uuid b/tests/ts/mount/fstab-uuid +index ce4c86ea8..45694c9f3 100755 +--- a/tests/ts/mount/fstab-uuid ++++ b/tests/ts/mount/fstab-uuid +@@ -40,12 +40,12 @@ ts_fstab_add "UUID=$UUID" + ts_udevadm_settle "$DEVICE" "UUID" + + # variant A) +-$TS_CMD_MOUNT $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_MOUNT -T "$TS_FSTAB" $TS_MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG + ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" + $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" + + # variant B) +-$TS_CMD_MOUNT -U $UUID >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_MOUNT -T "$TS_FSTAB" -U $UUID >> $TS_OUTPUT 2>> $TS_ERRLOG + ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" + $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" + +diff --git a/tests/ts/mount/fstab-uuid2devname b/tests/ts/mount/fstab-uuid2devname +index 4ce72556c..82367235f 100755 +--- a/tests/ts/mount/fstab-uuid2devname ++++ b/tests/ts/mount/fstab-uuid2devname +@@ -40,12 +40,12 @@ ts_fstab_add "$DEVICE" + ts_udevadm_settle "$DEVICE" "UUID" + + # variant A) +-$TS_CMD_MOUNT -U $UUID >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_MOUNT -T "$TS_FSTAB" -U $UUID >> $TS_OUTPUT 2>> $TS_ERRLOG + ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" + $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" + + # variant B) +-$TS_CMD_MOUNT "UUID=$UUID" >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_MOUNT -T "$TS_FSTAB" "UUID=$UUID" >> $TS_OUTPUT 2>> $TS_ERRLOG + ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" + $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" + +diff --git a/tests/ts/mount/fstab-uuid2label b/tests/ts/mount/fstab-uuid2label +index b1f983df1..1a2ffaada 100755 +--- a/tests/ts/mount/fstab-uuid2label ++++ b/tests/ts/mount/fstab-uuid2label +@@ -43,12 +43,12 @@ ts_fstab_add "LABEL=$LABEL" + ts_udevadm_settle "$DEVICE" "LABEL" "UUID" + + # variant A) +-$TS_CMD_MOUNT -U $UUID >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_MOUNT -T "$TS_FSTAB" -U $UUID >> $TS_OUTPUT 2>> $TS_ERRLOG + ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" + $TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" + + # variant B) +-$TS_CMD_MOUNT "UUID=$UUID" >> $TS_OUTPUT 2>> $TS_ERRLOG ++$TS_CMD_MOUNT -T "$TS_FSTAB" "UUID=$UUID" >> $TS_OUTPUT 2>> $TS_ERRLOG + ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" + $TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" + +-- +2.34.1 +