From 4495239b5ff6faf7aedaf4ae3a0f97f09b69372e Mon Sep 17 00:00:00 2001 From: Itxaka Date: Tue, 28 May 2024 14:30:21 +0200 Subject: [PATCH] Avoid calling udevadm with -v flag seems like it can block and has no timeout Signed-off-by: Itxaka --- pkg/lib/lock.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/lib/lock.go b/pkg/lib/lock.go index 25e7179..441f5f3 100644 --- a/pkg/lib/lock.go +++ b/pkg/lib/lock.go @@ -6,6 +6,7 @@ import ( "os" "os/exec" "strings" + "syscall" "time" "github.com/gofrs/uuid" @@ -59,13 +60,12 @@ func Luksify(label, version string, tpm bool) (string, error) { } // Make sure ghw will see all partitions correctly. - // Some versions of udevadm don't support --settle (e.g. alpine) - // and older versions don't have --type=all. Try the simpler version then. - out, err := SH("udevadm trigger --settle -v --type=all || udevadm trigger -v") + // older versions don't have --type=all. Try the simpler version then. + out, err := SH("udevadm trigger settle --type=all || udevadm trigger") if err != nil { return "", fmt.Errorf("udevadm trigger failed: %w, out: %s", err, out) } - SH("sync") //nolint:errcheck + syscall.Sync() part, b, err := FindPartition(label) if err != nil {