simono41/SpectreOS-old
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix

Browse source
This commit is contained in:
simono41 2018-07-17 15:13:02 +02:00
parent 1373be1bc8
commit 89ec715dbd
1 changed files with 948 additions and 956 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
arch-install
View file

@ -938,7 +938,8 @@ function abfrage() {
[[ -z "${autostart}" ]] && autostart=n
fi
read -p "Do you want a extra parameter for the installation? : [skipbootpartition/noinstall/debug] " extraparameter
echo "Warnung windualboot nur im UEFI getestet!!!"
read -p "Do you want a extra parameter for the installation? : [skipbootpartition/noinstall/debug/windualboot/dualboot] " extraparameter
for wort in ${extraparameter}
do
echo "$wort"
@ -1004,8 +1005,29 @@ function abfrage() {
m2ssd=p
fi
if [ "${dateisystem}" == "btrfs" ]; then
if [ "${Partition}" == "uefi" ]; then
if [ "y" == "windualboot" ] || [ "y" == "dualboot" ]; then
export skipbootpartition="y"
fi
if [ "y" == "windualboot" ]; then
bootpartitionnummer=${m2ssd}1
efipartitionnummer=${m2ssd}1
if [ "${swap}" != "n" ]; then
swappartitionnummer=${m2ssd}3
rootpartitionnummer=${m2ssd}4
else
rootpartitionnummer=${m2ssd}3
fi
elif [ "y" == "dualboot" ]; then
bootpartitionnummer=${m2ssd}1
efipartitionnummer=${m2ssd}2
if [ "${swap}" != "n" ]; then
swappartitionnummer=${m2ssd}3
rootpartitionnummer=${m2ssd}5
else
rootpartitionnummer=${m2ssd}4
fi
else
bootpartitionnummer=${m2ssd}1
efipartitionnummer=${m2ssd}2
if [ "${swap}" != "n" ]; then
@ -1014,36 +1036,6 @@ function abfrage() {
else
rootpartitionnummer=${m2ssd}3
fi
elif [ "${Partition}" == "bios" ]; then
bootpartitionnummer=${m2ssd}1
efipartitionnummer=${m2ssd}2
if [ "${swap}" != "n" ]; then
swappartitionnummer=${m2ssd}3
rootpartitionnummer=${m2ssd}4
else
rootpartitionnummer=${m2ssd}3
fi
fi
elif [ "${dateisystem}" == "ext4" ]; then
if [ "${Partition}" == "uefi" ]; then
bootpartitionnummer=${m2ssd}1
efipartitionnummer=${m2ssd}2
if [ "${swap}" != "n" ]; then
swappartitionnummer=${m2ssd}3
rootpartitionnummer=${m2ssd}4
else
rootpartitionnummer=${m2ssd}3
fi
elif [ "${Partition}" == "bios" ]; then
bootpartitionnummer=${m2ssd}1
efipartitionnummer=${m2ssd}2
if [ "${swap}" != "n" ]; then
swappartitionnummer=${m2ssd}3
rootpartitionnummer=${m2ssd}4
else
rootpartitionnummer=${m2ssd}3
fi
fi
fi
deviceluks="/dev/mapper/luks0"