diff --git a/go.mod b/go.mod index 11dbf638..a009e332 100644 --- a/go.mod +++ b/go.mod @@ -52,7 +52,7 @@ replace ( require ( github.com/google/fscrypt v0.3.5 - github.com/longhorn/go-common-libs v0.0.0-20250312065002-72871a09bee0 + github.com/longhorn/go-common-libs v0.0.0-20250319033109-764d1dea35f3 github.com/longhorn/types v0.0.0-20250311092239-23a07a51e0ba github.com/mitchellh/go-ps v1.0.0 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index ad6a12d4..f52fe20a 100644 --- a/go.sum +++ b/go.sum @@ -63,8 +63,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/longhorn/go-common-libs v0.0.0-20250312065002-72871a09bee0 h1:NSlPmMO0Szn4H69rypN/bsVhShgEAwMq3wBacWmPUvI= -github.com/longhorn/go-common-libs v0.0.0-20250312065002-72871a09bee0/go.mod h1:Yke3SMmcKCzngAu8fm5PNND2WiF/8blhsV4s6piy5zM= +github.com/longhorn/go-common-libs v0.0.0-20250319033109-764d1dea35f3 h1:sCyCt+54yhQ6qUVDupFfFogyCyBrfpQw3HdP61CXwxE= +github.com/longhorn/go-common-libs v0.0.0-20250319033109-764d1dea35f3/go.mod h1:Yke3SMmcKCzngAu8fm5PNND2WiF/8blhsV4s6piy5zM= github.com/longhorn/types v0.0.0-20250311092239-23a07a51e0ba h1:yLd2deP251APhViQUMa5MoZ1V90c1GsCFSDLRLpbOIM= github.com/longhorn/types v0.0.0-20250311092239-23a07a51e0ba/go.mod h1:3jHuVDtpkXQzpnp4prguDBskVRric2kmF8aSPkRJ4jw= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= diff --git a/vendor/github.com/longhorn/go-common-libs/ns/crypto.go b/vendor/github.com/longhorn/go-common-libs/ns/crypto.go index 048a0135..0d7de9dd 100644 --- a/vendor/github.com/longhorn/go-common-libs/ns/crypto.go +++ b/vendor/github.com/longhorn/go-common-libs/ns/crypto.go @@ -12,7 +12,7 @@ import ( // LuksOpen runs cryptsetup luksOpen with the given passphrase and // returns the stdout and error. func (nsexec *Executor) LuksOpen(volume, devicePath, passphrase string, timeout time.Duration) (stdout string, err error) { - args := []string{"luksOpen", devicePath, volume, "-d", "/dev/stdin"} + args := []string{"luksOpen", devicePath, volume, "-d", "-"} return nsexec.CryptsetupWithPassphrase(passphrase, args, timeout) } @@ -32,7 +32,7 @@ func (nsexec *Executor) LuksFormat(devicePath, passphrase, keyCipher, keyHash, k "--hash", keyHash, "--key-size", keySize, "--pbkdf", pbkdf, - devicePath, "-d", "/dev/stdin", + devicePath, "-d", "-", } return nsexec.CryptsetupWithPassphrase(passphrase, args, timeout) } diff --git a/vendor/modules.txt b/vendor/modules.txt index 19414b71..47daa80c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -77,7 +77,7 @@ github.com/josharian/intern # github.com/json-iterator/go v1.1.12 ## explicit; go 1.12 github.com/json-iterator/go -# github.com/longhorn/go-common-libs v0.0.0-20250312065002-72871a09bee0 +# github.com/longhorn/go-common-libs v0.0.0-20250319033109-764d1dea35f3 ## explicit; go 1.23.0 github.com/longhorn/go-common-libs/exec github.com/longhorn/go-common-libs/io