Compare commits

...

3 Commits

Author SHA1 Message Date
Itxaka
70dfc0c14b Drop settle for all
Signed-off-by: Itxaka <itxaka@kairos.io>
2024-05-28 20:56:56 +02:00
Itxaka
2f3a99f421 Remove -v flag on udev unlock
it can cause locks

Signed-off-by: Itxaka <itxaka@kairos.io>
2024-05-28 19:24:59 +02:00
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
2 changed files with 5 additions and 5 deletions

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

View File

@@ -41,7 +41,7 @@ func UnlockAllWithLogger(tpm bool, logger zerolog.Logger) error {
// Some versions of udevadm don't support --settle (e.g. alpine) // Some versions of udevadm don't support --settle (e.g. alpine)
// and 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.
logger.Info().Msgf("triggering udev to populate disk info") logger.Info().Msgf("triggering udev to populate disk info")
_, err = utils.SH("udevadm trigger --settle -v --type=all || udevadm trigger -v") _, err = utils.SH("udevadm trigger --type=all || udevadm trigger")
if err != nil { if err != nil {
return err return err
} }