diff --git a/XPS-13-7390-2-in-1--.md b/XPS-13-7390-2-in-1--.md index e832489..699f0eb 100644 --- a/XPS-13-7390-2-in-1--.md +++ b/XPS-13-7390-2-in-1--.md @@ -38,9 +38,9 @@ then connect remotely with : *ssh* # update zsys-setup to enable zfs encryption and create a swap partition right sized for hibernation. -SWAPSIZE=$(cat /proc/meminfo | grep MemTotal | awk -F' ' '{print $2}') +## enable zfs encyption on rpool -## enable zfs encyption +bpool remain unencrypt. ~~~ Boot the Ubuntu 20.04 Desktop installer/live CD. @@ -61,17 +61,20 @@ Run ubiquity to start the installer and install as normal, selecting “Use enti ## create swap partition to permit Hibernate ~~~ - # Convert to MiB to align the size on the size of a block - SWAPVOLSIZE=$(( SWAPSIZE / 1024 / 1024 )) - - prepare_target "${TARGET}" - SWAPVOLSIZE=$(( 32768 )) - format_disk "${DISK}" "${PARTBASE}" "${PARTESP}" "${PARTBPOOL}" "${PARTRPOOL}" "${SWAPVOLSIZE}" - init_zfs "${TARGET}" "${DISK}${PARTBASE}${PARTBPOOL}" "${DISK}${PARTBASE}${PARTRPOOL}" - init_system_partitions "${TARGET}" "${DISK}${PARTBASE}1" "${DISK}${PARTBASE}${PARTESP}" + # Convert to MiB to align the size on the size of a block + SWAPVOLSIZE=$(( SWAPSIZE / 1024 / 1024 )) + +MEMSIZE=$(cat /proc/meminfo | grep MemTotal | awk -F' ' '{print $2}') +SWAPVOLSIZE=$(( MEMSIZE / 1024 )) + prepare_target "${TARGET}" + format_disk "${DISK}" "${PARTBASE}" "${PARTESP}" "${PARTBPOOL}" "${PARTRPOOL}" "${SWAPVOLSIZE}" + init_zfs "${TARGET}" "${DISK}${PARTBASE}${PARTBPOOL}" "${DISK}${PARTBASE}${PARTRPOOL}" + init_system_partitions "${TARGET}" "${DISK}${PARTBASE}1" "${DISK}${PARTBASE}${PARTESP}" ~~~ + + source : [Linsomniac's Articles - Encrypting ZFS on Ubuntu 20.04](https://linsomniac.gitlab.io/post/2020-04-09-ubuntu-2004-encrypted-zfs/) boot after press esc then F12