mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #147 from jonte/feature/cryptsetup_cipher

Browse Source 
daemon: cryptsetup_open: Add --cipher
This commit is contained in:
rwmjones
2024-06-20 10:43:47 +01:00
committed by GitHub
parent 12da1de0a8 465be22d9b
commit 893c05fc40
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
daemon/cryptsetup.ml
View File

@@ -23,7 +23,7 @@ open Std_utils
open Utils
let cryptsetup_open ?(readonly = false) ?crypttype device key mapname =
let cryptsetup_open ?(readonly = false) ?crypttype ?cipher device key mapname =
(* Sanity check: /dev/mapper/mapname must not exist already. Note
* that the device-mapper control device (/dev/mapper/control) is
* always there, so you can't ever have mapname == "control".
@@ -53,6 +53,7 @@ let cryptsetup_open ?(readonly = false) ?crypttype device key mapname =
List.push_back_list args ["-d"; keyfile];
if readonly then List.push_back args "--readonly";
List.push_back_list args ["open"; device; mapname; "--type"; crypttype];
Option.iter (fun s -> List.push_back_list args ["--cipher"; s]) cipher;
(* Make sure we always remove the temporary file. *)
protect ~f:(fun () -> ignore (command "cryptsetup" !args))

5
generator/actions_core.ml
View File

@@ -9661,7 +9661,7 @@ This returns the UUID of the LUKS device C<device>." };
{ defaults with
name = "cryptsetup_open"; added = (1, 43, 2);
style = RErr, [String (Device, "device"); String (Key, "key"); String (PlainString, "mapname")], [OBool "readonly"; OString "crypttype"];
style = RErr, [String (Device, "device"); String (Key, "key"); String (PlainString, "mapname")], [OBool "readonly"; OString "crypttype"; OString "cipher";];
impl = OCaml "Cryptsetup.cryptsetup_open";
optional = Some "luks";
test_excuse = "no way to format BitLocker, and smallest device is huge";
@@ -9703,6 +9703,9 @@ A Windows BitLocker device.
The optional C<readonly> flag, if set to true, creates a
read-only mapping.
The optional C<cipher> parameter allows specifying which
cipher to use.
If this block device contains LVM volume groups, then
calling C<guestfs_lvm_scan> with the C<activate>
parameter C<true> will make them visible.