diff --git a/src/install.rs b/src/install.rs index 8929404..d53cf50 100644 --- a/src/install.rs +++ b/src/install.rs @@ -49,6 +49,7 @@ impl InstallationType { --dry-run=$dry_run --definitions=$cfgdir --empty=force + --json=pretty $blockdev ) .map_err(|e| color_eyre::eyre::eyre!("systemd-repart failed").wrap_err(e))?; diff --git a/src/util.rs b/src/util.rs index 66d8e74..2a9db21 100644 --- a/src/util.rs +++ b/src/util.rs @@ -4,6 +4,7 @@ use color_eyre::Section as _; // pub const MAX_EFI_SIZE: ByteSize = ByteSize::gb(1); pub const DEFAULT_SQUASH_LOCATION: &str = "/run/initramfs/live/LiveOS/squashfs.img"; +pub const LIVE_BASE: &str = "/dev/mapper/live-base"; #[cfg(target_os = "linux")] /// Check if the current running system is UEFI or not. diff --git a/templates/chromebookinstall/50-root.conf b/templates/chromebookinstall/50-root.conf index 316793d..afe417b 100644 --- a/templates/chromebookinstall/50-root.conf +++ b/templates/chromebookinstall/50-root.conf @@ -3,7 +3,7 @@ Type=root Format=btrfs # Verity=data # VerityMatchKey=root -Subvolumes=@ @home +Subvolumes=/@ /@home MountPoint=/:rw,seclabel,relatime,compress=zstd:1,ssd,discard=async,space_cache=v2,subvolid=257,subvol=/@ MountPoint=/home:rw,seclabel,relatime,compress=zstd:1,ssd,discard=async,space_cache=v2,subvolid=256,subvol=/@home FactoryReset=yes