Skip to content

Commit

Permalink
Drop settle for all
Browse files Browse the repository at this point in the history
Signed-off-by: Itxaka <[email protected]>
  • Loading branch information
Itxaka committed May 28, 2024
1 parent 2f3a99f commit 70dfc0c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pkg/lib/lock.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func Luksify(label, version string, tpm bool) (string, error) {

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

0 comments on commit 70dfc0c

Please sign in to comment.