custom-gui-packages/pika-installer-gtk4
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix luks escape

Browse Source
This commit is contained in:
Ward from fusion-voyager-3 2024-08-24 02:35:55 +03:00
parent 3bfd2d7139
commit fe699ae2b4
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/installation_progress_page/mod.rs
View File

@ -332,7 +332,7 @@ touch /tmp/PIKA_CRYPT/crypttab
), ),
( (
"LUKS_PASSWD".to_string(), "LUKS_PASSWD".to_string(),
p.as_str() p.replace("'", r###""'""###).as_str()
) )
]), ]),
) )

2
src/manual_partitioning_page/func.rs
View File

@ -994,7 +994,7 @@ fn post_check_drive_mount(
row, row,
move |_| { move |_| {
if row.mountpoint() == "[SWAP]" { if row.mountpoint() == "[SWAP]" {
if partition.part_fs == "linux-swap" { if partition.part_fs == "linux-swap" || partition.part_fs == "swap" {
(*partition_row_struct.swap_fs_error.borrow_mut()) = false; (*partition_row_struct.swap_fs_error.borrow_mut()) = false;
if *partition_row_struct.never.borrow() == false if *partition_row_struct.never.borrow() == false
&& *partition_row_struct.swap_fs_error.borrow() == false && *partition_row_struct.swap_fs_error.borrow() == false

3
src/manual_partitioning_page/mod.rs
View File

@ -167,6 +167,8 @@ pub fn manual_partitioning_page(
#[strong] #[strong]
language_changed_action, language_changed_action,
#[strong] #[strong]
partition_array_refcell,
#[strong]
used_partition_array_refcell, used_partition_array_refcell,
#[strong] #[strong]
subvol_partition_array_refcell, subvol_partition_array_refcell,
@ -198,6 +200,7 @@ pub fn manual_partitioning_page(
(*partition_method_manual_fstab_entry_array_refcell.borrow_mut()) = Vec::new(); (*partition_method_manual_fstab_entry_array_refcell.borrow_mut()) = Vec::new();
(*partition_method_manual_luks_enabled_refcell.borrow_mut()) = false; (*partition_method_manual_luks_enabled_refcell.borrow_mut()) = false;
(*partition_method_manual_crypttab_entry_array_refcell.borrow_mut()) = Vec::new(); (*partition_method_manual_crypttab_entry_array_refcell.borrow_mut()) = Vec::new();
(*partition_array_refcell.borrow_mut()) = get_partitions();
(*used_partition_array_refcell.borrow_mut()) = Vec::new(); (*used_partition_array_refcell.borrow_mut()) = Vec::new();
(*subvol_partition_array_refcell.borrow_mut()) = Vec::new(); (*subvol_partition_array_refcell.borrow_mut()) = Vec::new();
(*extra_mount_id_refcell.borrow_mut()) = 3; (*extra_mount_id_refcell.borrow_mut()) = 3;