Add luks support

This commit is contained in:
MatMoul 2015-08-22 21:37:40 +02:00
parent 56ad0869a4
commit a5b957a0e6

10
archfi
View file

@ -669,7 +669,7 @@ archmenu(){
options+=("${txtgenerate//%1/cryptotab}" "") options+=("${txtgenerate//%1/cryptotab}" "")
fi fi
if [ "$luksroot" = "1" ]; then if [ "$luksroot" = "1" ]; then
options+=("${txtgenrate//%1/mkinitcpio.conf}" "(encrypt hooks)") options+=("${txtgenerate//%1/mkinitcpio.conf}" "(encrypt hooks)")
fi fi
options+=("${txtedit//%1/fstab}" "($txtoptional)") options+=("${txtedit//%1/fstab}" "($txtoptional)")
options+=("${txtedit//%1/mkinitcpio.conf}" "($txtoptional)") options+=("${txtedit//%1/mkinitcpio.conf}" "($txtoptional)")
@ -710,7 +710,7 @@ archmenu(){
nextitem="${txtgenerate//%1/cryptotab}" nextitem="${txtgenerate//%1/cryptotab}"
else else
if [ "$luksroot" = "1" ]; then if [ "$luksroot" = "1" ]; then
nextitem="${txtgenrate//%1/mkinitcpio.conf}" nextitem="${txtgenerate//%1/mkinitcpio.conf}"
else else
nextitem="${txtinstall//%1/grub}" nextitem="${txtinstall//%1/grub}"
fi fi
@ -719,12 +719,12 @@ archmenu(){
"${txtgenerate//%1/cryptotab}") "${txtgenerate//%1/cryptotab}")
archgencryptotab archgencryptotab
if [ "$luksroot" = "1" ]; then if [ "$luksroot" = "1" ]; then
nextitem="${txtgenrate//%1/mkinitcpio.conf}" nextitem="${txtgenerate//%1/mkinitcpio.conf}"
else else
nextitem="${txtinstall//%1/grub}" nextitem="${txtinstall//%1/grub}"
fi fi
;; ;;
"${txtgenrate//%1/mkinitcpio.conf}") "${txtgenerate//%1/mkinitcpio.conf}")
archgenmkinitcpio archgenmkinitcpio
nextitem="${txtinstall//%1/grub}" nextitem="${txtinstall//%1/grub}"
;; ;;
@ -946,7 +946,7 @@ archinstallgrub(){
if [ "$luksroot" = "1" ]; then if [ "$luksroot" = "1" ]; then
if (whiptail --backtitle "$apptitle" --title "${txtinstall//%1/grub}" --yesno "luks root detected ! Add to grub.cfg" 0 0) then if (whiptail --backtitle "$apptitle" --title "${txtinstall//%1/grub}" --yesno "luks root detected ! Add to grub.cfg" 0 0) then
clear clear
sed -i s/GRUB_CMDLINE_LINUX=\"\"/GRUB_CMDLINE_LINUX=\"root=/dev/mapper/root cryptdevice=/dev/disk/by-uuid/$luksrootuuid:root\"/g /mnt/etc/default/grub sed -i /GRUB_CMDLINE_LINUX=/c\GRUB_CMDLINE_LINUX=\"cryptdevice=/dev/disk/by-uuid/$luksrootuuid:root\" /mnt/etc/default/grub
fi fi
fi fi