mirror of
https://github.com/kairos-io/kcrypt.git
synced 2025-04-27 19:29:09 +00:00
Avoid calling udevadm with -v flag
seems like it can block and has no timeout Signed-off-by: Itxaka <itxaka@kairos.io>
This commit is contained in:
parent
f6ed18cd18
commit
4495239b5f
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user