summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch')
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch35
1 files changed, 0 insertions, 35 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch b/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch
deleted file mode 100644
index 1b433d3ad3..0000000000
--- a/meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From fae8852a63d9fa6e56fb8b24eaf10560bd13757f Mon Sep 17 00:00:00 2001
2From: Yongxin Liu <yongxin.liu@windriver.com>
3Date: Tue, 12 Nov 2019 11:33:50 +0800
4Subject: [PATCH] mkswap01.sh: Add "udevadm trigger" before swap verification
5
6Fix: https://github.com/linux-test-project/ltp/issues/458
7
8Sometimes the swap device cannot show up in /dev/disk/by-uuid/
9or /dev/disk/by-lable/ due to the issue #458. When this issue
10happens, "blkid -c /dev/null" and "ls /dev/disk/by-uuid/" show
11different UUID of the device.
12
13Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1193414]
14
15Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com>
16---
17 testcases/commands/mkswap/mkswap01.sh | 2 ++
18 1 file changed, 2 insertions(+)
19
20diff --git a/testcases/commands/mkswap/mkswap01.sh b/testcases/commands/mkswap/mkswap01.sh
21index 3a348c6e6..9437c4a4e 100755
22--- a/testcases/commands/mkswap/mkswap01.sh
23+++ b/testcases/commands/mkswap/mkswap01.sh
24@@ -129,6 +129,8 @@ mkswap_test()
25 return
26 fi
27
28+ udevadm trigger --name-match=$TST_DEVICE
29+
30 if [ -n "$device" ]; then
31 mkswap_verify "$mkswap_op" "$op_arg" "$device" "$size" "$dev_file"
32 if [ $? -ne 0 ]; then
33--
342.14.4
35