fix: check stderr output deactivating luks volume

gabelluardo · gabelluardo · commit 8bfd7b60aa62 · 2026-02-02T12:05:30.000+01:00
diff --git a/internal/luks2/activate.go b/internal/luks2/activate.go
@@ -60,7 +60,7 @@ func Deactivate(volumeName string) error {
 	cmd.Env = os.Environ()
 	cmd.Env = append(cmd.Env, "SYSTEMD_LOG_TARGET=console")
 
-	if output, err := cmd.CombinedOutput(); err != nil {
+	if output, err := cmd.CombinedOutput(); err != nil || cmd.Stderr != nil {
 		return fmt.Errorf("systemd-cryptsetup failed with: %v", osutil.OutputErr(output, err))
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ func Deactivate(volumeName string) error {`
`60`	`60`	`cmd.Env = os.Environ()`
`61`	`61`	`cmd.Env = append(cmd.Env, "SYSTEMD_LOG_TARGET=console")`
`62`	`62`
`63`		`- if output, err := cmd.CombinedOutput(); err != nil {`
	`63`	`+ if output, err := cmd.CombinedOutput(); err != nil \|\| cmd.Stderr != nil {`
`64`	`64`	`return fmt.Errorf("systemd-cryptsetup failed with: %v", osutil.OutputErr(output, err))`
`65`	`65`	`}`
`66`	`66`