From 105e342f20fa7e548606675e174e32d84abf5e65 Mon Sep 17 00:00:00 2001 From: Dan Johansen Date: Thu, 29 Dec 2022 07:13:05 +0100 Subject: [PATCH] add encryption support to clockworkpi The Clockwork Pi DevTerm is an rk3399 based device, so encryption should work, just like with the other rk3399 based devices we have. So enable the prompt on the DevTerm to ask for encryption. Fixes #50. Signed-off-by: Dan Johansen --- manjaro-arm-installer | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manjaro-arm-installer b/manjaro-arm-installer index 2f352b6..dde08dd 100755 --- a/manjaro-arm-installer +++ b/manjaro-arm-installer @@ -2,7 +2,7 @@ # Set globals # ***************************** -VERSION="1.5.1" +VERSION="1.5.3" # ***************************** TMPDIR=/var/tmp/manjaro-arm-installer ARCH='aarch64' @@ -699,7 +699,7 @@ post_crypt () { # Modify the /boot/extlinux/extlinux.conf to match our needs case "$DEVICE" in - pbpro|rockpi4b|rockpi4c|rockpro64) + clockworkpi-a06|pbpro|rockpi4b|rockpi4c|rockpro64) # NOTE: I've tried to only modify the cryptdevice and root parameters but bootsplash and console=ttyS2 prevents to show the password prompt # TODO: Need to add plymouth support sed -i -e "s!APPEND.*!APPEND initrd=/initramfs-linux.img console=tty1 cryptdevice=UUID=${UUID}:ROOT_MNJRO root=/dev/mapper/ROOT_MNJRO rw rootwait!g" ${TMPDIR}/boot/extlinux/extlinux.conf @@ -936,7 +936,7 @@ else exit 1 fi -if [[ "$DEVICE" = "pbpro" ]] || [[ "$DEVICE" = "rockpro64" ]] || [[ "$DEVICE" = "rockpi4b" ]] || [[ "$DEVICE" = "rockpi4c" ]] && [[ "$FSTYPE" != "btrfs" ]] && [[ "$FSTYPE" != "f2fs" ]]; then +if [[ "$DEVICE" = "clockworkpi-a06" ]] || [[ "$DEVICE" = "pbpro" ]] || [[ "$DEVICE" = "rockpro64" ]] || [[ "$DEVICE" = "rockpi4b" ]] || [[ "$DEVICE" = "rockpi4c" ]] && [[ "$FSTYPE" != "btrfs" ]] && [[ "$FSTYPE" != "f2fs" ]]; then CRYPT=$(dialog --clear --title "Manjaro ARM Installer v${VERSION}" \ --menu "[Experimental!] Do you want encryption on root partition?" 10 90 10 \ "no" "No, thanks" \