rancher/kcrypt
1
0
Fork 0
mirror of https://github.com/kairos-io/kcrypt.git synced 2025-04-27 11:21:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid calling udevadm with -v flag

Browse Source 
seems like it can block and has no timeout

Signed-off-by: Itxaka <itxaka@kairos.io>
This commit is contained in:
Itxaka 2024-05-28 14:30:21 +02:00
parent f6ed18cd18
commit 4495239b5f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/lib/lock.go
View File

@ -6,6 +6,7 @@ import (
"os" "os"
"os/exec" "os/exec"
"strings" "strings"
"syscall"
"time" "time"
"github.com/gofrs/uuid" "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. // Make sure ghw will see all partitions correctly.
// Some versions of udevadm don't support --settle (e.g. alpine) // older versions don't have --type=all. Try the simpler version then.
// and older versions don't have --type=all. Try the simpler version then. out, err := SH("udevadm trigger settle --type=all || udevadm trigger")
out, err := SH("udevadm trigger --settle -v --type=all || udevadm trigger -v")
if err != nil { if err != nil {
return "", fmt.Errorf("udevadm trigger failed: %w, out: %s", err, out) return "", fmt.Errorf("udevadm trigger failed: %w, out: %s", err, out)
} }
SH("sync") //nolint:errcheck syscall.Sync()
part, b, err := FindPartition(label) part, b, err := FindPartition(label)
if err != nil { if err != nil {