From b6b8bb86ce7f13c38f9ad23d3e7ffdeceea40995 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 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/lib/lock.go b/pkg/lib/lock.go index 8f366db..bfc6321 100644 --- a/pkg/lib/lock.go +++ b/pkg/lib/lock.go @@ -53,13 +53,12 @@ func Luksify(label string, logger zerolog.Logger) (string, error) { var pass string // 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 {