LUKS Enhancements

This commit sets the allow-discards option for LUKS devices.

Author: jwebster7

utils/devices/luks/luks_linux.go

@@ -230,8 +230,8 @@ func (d *LUKSDevice) Open(ctx context.Context, luksPassphrase string) error {
 	}
 
 	output, err := d.command.ExecuteWithTimeoutAndInput(
-		ctx, "cryptsetup", luksCommandTimeout, true, luksPassphrase, "open", device,
-		luksDeviceName, "--type", "luks2",
+		ctx, "cryptsetup", luksCommandTimeout, true, luksPassphrase,
+		"open", device, luksDeviceName, "--type", "luks2", "--allow-discards", "--persistent",
 	)
 	if err != nil {
 		Logc(ctx).WithFields(LogFields{

utils/devices/luks/luks_linux_test.go

@@ -47,6 +47,7 @@ func mockCryptsetupLuksOpen(mock *mockexec.MockCommand) *gomock.Call {
 	return mock.EXPECT().ExecuteWithTimeoutAndInput(
 		gomock.Any(), "cryptsetup", luksCommandTimeout, true, gomock.Any(),
 		"open", gomock.Any(), gomock.Any(), "--type", "luks2",
+		"--allow-discards", "--persistent",
 	)
 }
 
@@ -58,8 +59,8 @@ func mockCryptsetupLuksStatusWithDevicePath(mock *mockexec.MockCommand) *gomock.
 
 func mockCryptsetupLuksTestPassphrase(mock *mockexec.MockCommand) *gomock.Call {
 	return mock.EXPECT().ExecuteWithTimeoutAndInput(
-		gomock.Any(), "cryptsetup", luksCommandTimeout, true, gomock.Any(), "open", gomock.Any(),
-		gomock.Any(), "--type", "luks2", "--test-passphrase",
+		gomock.Any(), "cryptsetup", luksCommandTimeout, true, gomock.Any(),
+		"open", gomock.Any(), gomock.Any(), "--type", "luks2", "--test-passphrase",
 	)
 }