Compare commits

...

1 Commits

Author SHA1 Message Date
Itxaka
4495239b5f Avoid calling udevadm with -v flag
seems like it can block and has no timeout

Signed-off-by: Itxaka <itxaka@kairos.io>
2024-05-28 14:46:57 +02:00

View File

@@ -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 {