mirror of
https://github.com/kairos-io/kcrypt.git
synced 2025-04-27 11:21:45 +00:00
Try a simpler version of "udevadm trigger"
in case the other options are not supported Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>
This commit is contained in:
parent
c936f74913
commit
f6ed18cd18
@ -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)
|
||||
}
|
||||
|
@ -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
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user