Skip to content

Commit

Permalink
Try a simpler version of "udevadm trigger"
Browse files Browse the repository at this point in the history
in case the other options are not supported

Signed-off-by: Dimitris Karakasilis <[email protected]>
  • Loading branch information
jimmykarily authored and Itxaka committed May 28, 2024
1 parent c936f74 commit f6ed18c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
6 changes: 4 additions & 2 deletions pkg/lib/lock.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,10 @@ func Luksify(label, version string, tpm bool) (string, error) {
return "", fmt.Errorf("version must be luks1 or luks2")
}

// Make sure ghw will see all partitions correctly
out, err := SH("udevadm trigger --settle -v --type=all")
// 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")
if err != nil {
return "", fmt.Errorf("udevadm trigger failed: %w, out: %s", err, out)
}
Expand Down
4 changes: 3 additions & 1 deletion pkg/lib/unlock.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,10 @@ func UnlockAllWithLogger(tpm bool, logger zerolog.Logger) error {
return nil
}

// Some versions of udevadm don't support --settle (e.g. alpine)
// and older versions don't have --type=all. Try the simpler version then.
logger.Info().Msgf("triggering udev to populate disk info")
_, err = utils.SH("udevadm trigger -v --type=all")
_, err = utils.SH("udevadm trigger --settle -v --type=all || udevadm trigger -v")
if err != nil {
return err
}
Expand Down

0 comments on commit f6ed18c

Please sign in to comment.