Signed-off-by: Christoph Heiss <c.he...@proxmox.com>
---
proxmox-tui-installer/src/views/bootdisk.rs | 34 +++++++++++++++------
1 file changed, 24 insertions(+), 10 deletions(-)
diff --git a/proxmox-tui-installer/src/views/bootdisk.rs
b/proxmox-tui-installer/src/views/bootdisk.rs
index 107fc9c..7a34d63 100644
--- a/proxmox-tui-installer/src/views/bootdisk.rs
+++ b/proxmox-tui-installer/src/views/bootdisk.rs
@@ -19,8 +19,9 @@ use proxmox_installer_common::{
check_zfs_raid_config,
},
options::{
- AdvancedBootdiskOptions, BootdiskOptions, BtrfsBootdiskOptions,
BtrfsCompressOption, Disk,
- FsType, LvmBootdiskOptions, ZfsBootdiskOptions, ZFS_CHECKSUM_OPTIONS,
ZFS_COMPRESS_OPTIONS,
+ AdvancedBootdiskOptions, BootdiskOptions, BtrfsBootdiskOptions, Disk,
FsType,
+ LvmBootdiskOptions, ZfsBootdiskOptions, BTRFS_COMPRESS_OPTIONS,
ZFS_CHECKSUM_OPTIONS,
+ ZFS_COMPRESS_OPTIONS,
},
setup::{BootType, ProductConfig, ProxmoxProduct, RuntimeInfo},
};
@@ -521,12 +522,23 @@ struct BtrfsBootdiskOptionsView {
impl BtrfsBootdiskOptionsView {
fn new(disks: &[Disk], options: &BtrfsBootdiskOptions) -> Self {
- let view = MultiDiskOptionsView::new(
- disks,
- &options.selected_disks,
- FormView::new().child("hdsize",
DiskSizeEditView::new().content(options.disk_size)),
- )
- .top_panel(TextView::new("Btrfs integration is a technology
preview!").center());
+ let inner = FormView::new()
+ .child(
+ "compress",
+ SelectView::new()
+ .popup()
+ .with_all(BTRFS_COMPRESS_OPTIONS.iter().map(|o|
(o.to_string(), *o)))
+ .selected(
+ BTRFS_COMPRESS_OPTIONS
+ .iter()
+ .position(|o| *o == options.compress)
+ .unwrap_or_default(),
+ ),
+ )
+ .child("hdsize",
DiskSizeEditView::new().content(options.disk_size));
+
+ let view = MultiDiskOptionsView::new(disks, &options.selected_disks,
inner)
+ .top_panel(TextView::new("Btrfs integration is a technology
preview!").center());
Self { view }
}
@@ -537,14 +549,16 @@ impl BtrfsBootdiskOptionsView {
fn get_values(&mut self) -> Option<(Vec<Disk>, BtrfsBootdiskOptions)> {
let (disks, selected_disks) = self.view.get_disks_and_selection()?;
- let disk_size = self.view.inner_mut()?.get_value::<DiskSizeEditView,
_>(0)?;
+ let view = self.view.inner_mut()?;
+ let disk_size = view.get_value::<DiskSizeEditView, _>(1)?;
+ let compress = view.get_value::<SelectView<_>, _>(0)?;
Some((
disks,
BtrfsBootdiskOptions {
disk_size,
selected_disks,
- compress: BtrfsCompressOption::default(),
+ compress,
},
))
}
--
2.44.0
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
