Commit 6e04b109 authored by fsmithred's avatar fsmithred

Use luks1 format for encrypted /boot. (Debian bug #927165)

parent dca974ed
......@@ -3,6 +3,7 @@ refractainstaller-gui (9.5.4) unstable; urgency=low
* fstab fixes for swap and /boot/efi
* Make some static entries in /dev
* Let terminal die when finished.
* Use luks1 format for encrypted /boot. (Debian bug #927165)
-- fsmithred <fsmithred@gmail.com>
......
#!/usr/bin/env bash
version="Refracta UEFI/BIOS Installer (Yad) 9.5.3+ (20191116)"
version="Refracta UEFI/BIOS Installer (Yad) 9.5.4 (20191210)"
TEXTDOMAIN=refractainstaller-gui
TEXTDOMAINDIR=/usr/share/locale/
......@@ -603,7 +603,7 @@ if [[ $sep_boot != "yes" ]]; then
encrypt_boot="yes"
yad --window-icon=gtk-dialog-warning --title=$"Warning" --center --borders=10 \
--button=$"Continue":0 \
--button=$"Abort":1 --text=$"Your /boot directory will be part of the encrypted filesystem.\n\nYou can proceed, or you can exit and start over if you want a separate partition for /boot."
--button=$"Abort":1 --text=$"Your /boot directory will be part of the encrypted filesystem and luks1 format will be used.\n\nYou can proceed, or you can exit and start over if you want a separate partition for /boot."
ans="$?"
case $ans in
0) ;;
......@@ -1224,7 +1224,11 @@ exec 2>/dev/null
return
else
passphr=$(echo $setpass | awk -F"@_@" '{ print $1 }')
echo "$passphr" | cryptsetup luksFormat "$luks_dev"
if [[ $encrypt_boot = "yes" ]] ; then
echo "$passphr" | cryptsetup luksFormat -type luks1 "$luks_dev"
else
echo "$passphr" | cryptsetup luksFormat -type "$luks_dev"
fi
echo "$passphr" | cryptsetup luksOpen "$luks_dev" "$mapper_name"
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment