jess
/
manjaro-arm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <strit@manjaro.org>
This commit is contained in:
Dan Johansen 2022-12-29 07:13:05 +01:00
parent 5f43d9dc62
commit 105e342f20
No known key found for this signature in database
GPG Key ID: 084A7FC0035B1D49
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manjaro-arm-installer
View File

@ -2,7 +2,7 @@
# Set globals # Set globals
# ***************************** # *****************************
VERSION="1.5.1" VERSION="1.5.3"
# ***************************** # *****************************
TMPDIR=/var/tmp/manjaro-arm-installer TMPDIR=/var/tmp/manjaro-arm-installer
ARCH='aarch64' ARCH='aarch64'
@ -699,7 +699,7 @@ post_crypt () {
# Modify the /boot/extlinux/extlinux.conf to match our needs # Modify the /boot/extlinux/extlinux.conf to match our needs
case "$DEVICE" in 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 # 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 # 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 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 exit 1
fi 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}" \ CRYPT=$(dialog --clear --title "Manjaro ARM Installer v${VERSION}" \
--menu "[Experimental!] Do you want encryption on root partition?" 10 90 10 \ --menu "[Experimental!] Do you want encryption on root partition?" 10 90 10 \
"no" "No, thanks" \ "no" "No, thanks" \