ouroboros-gorup/obos-fi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bug correction: syslinux with luks

Browse source
This commit is contained in:
MatMoul 2018-12-31 03:13:53 +01:00
parent 27f098e6bf
commit ec968c7490
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
archfi
View file

@ -420,6 +420,7 @@ selectparts(){
if [ ! "$?" = "0" ]; then if [ ! "$?" = "0" ]; then
return 1 return 1
fi fi
realrootdev=$rootdev
homedev=$(whiptail --backtitle "$apptitle" --title "$txtselectpartsmenu" --menu "${txtselectdevice//%1/home}" 0 0 0 \ homedev=$(whiptail --backtitle "$apptitle" --title "$txtselectpartsmenu" --menu "${txtselectdevice//%1/home}" 0 0 0 \
"none" "-" \ "none" "-" \
@ -648,6 +649,7 @@ formatdevice(){
pressanykey pressanykey
formatdevice $1 /dev/mapper/$1 noluks formatdevice $1 /dev/mapper/$1 noluks
if [ "$1" = "root" ]; then if [ "$1" = "root" ]; then
realrootdev=$rootdev
rootdev=/dev/mapper/$1 rootdev=/dev/mapper/$1
luksroot=1 luksroot=1
luksrootuuid=$(cryptsetup luksUUID $2) luksrootuuid=$(cryptsetup luksUUID $2)
@ -1259,7 +1261,7 @@ archbootloadersyslinuxbmenu(){
archsyslinuxinstall(){ archsyslinuxinstall(){
clear clear
if [ "$(parted ${rootdev::8} print|grep gpt)" != "" ]; then if [ "$(parted ${realrootdev::8} print|grep gpt)" != "" ]; then
echo "Add gptfdisk to support your gpt disk" echo "Add gptfdisk to support your gpt disk"
additionalpkg=$additionalpkg"gptfdisk " additionalpkg=$additionalpkg"gptfdisk "
fi fi
@ -1278,8 +1280,8 @@ archsyslinuxinstall(){
clear clear
echo "Updating /boot/syslinux/syslinux.cfg" echo "Updating /boot/syslinux/syslinux.cfg"
if [ "$luksroot" = "1" ]; then if [ "$luksroot" = "1" ]; then
echo "sed -i \"/APPEND\ root=/c\ APPEND root=/dev/mapper/root cryptdevice=$rootdev:root rw\" /mnt/boot/syslinux/syslinux.cfg" echo "sed -i \"/APPEND\ root=/c\ APPEND root=/dev/mapper/root cryptdevice=$realrootdev:root rw\" /mnt/boot/syslinux/syslinux.cfg"
sed -i "/APPEND\ root=/c\ APPEND root=/dev/mapper/root cryptdevice=$rootdev:root\ rw" /mnt/boot/syslinux/syslinux.cfg sed -i "/APPEND\ root=/c\ APPEND root=/dev/mapper/root cryptdevice=$realrootdev:root\ rw" /mnt/boot/syslinux/syslinux.cfg
else else
echo "sed -i \"/APPEND\ root=/c\ APPEND root=$rootdev rw\" /mnt/boot/syslinux/syslinux.cfg" echo "sed -i \"/APPEND\ root=/c\ APPEND root=$rootdev rw\" /mnt/boot/syslinux/syslinux.cfg"
sed -i "/APPEND\ root=/c\ APPEND root=$rootdev\ rw" /mnt/boot/syslinux/syslinux.cfg sed -i "/APPEND\ root=/c\ APPEND root=$rootdev\ rw" /mnt/boot/syslinux/syslinux.cfg