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 17:29:52 +02:00
parent e7127529e7
commit 3f0110d549
1 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
arch-install
View file

@ -927,12 +927,12 @@ function abfrage() {
[[ -z "${autostart}" ]] && autostart=n [[ -z "${autostart}" ]] && autostart=n
fi fi
echo "Warnung windualboot nur im UEFI getestet!!!"
read -p "Do you want a extra parameter for the installation? : [skipbootpartition/noinstall/debug/windualboot/dualboot] " extraparameter read -p "Do you want a extra parameter for the installation? : [skipbootpartition/noinstall/debug/windualboot/dualboot] " extraparameter
for wort in ${extraparameter} for wort in ${extraparameter}
do do
echo "$wort" echo "$wort"
export ${wort}="y" export ${wort}="y"
echo "Extra-Parameter ${wort}=y"
done done
# Ausgaben # Ausgaben
@ -994,10 +994,6 @@ function abfrage() {
m2ssd=p m2ssd=p
fi fi
if [ "y" == "windualboot" ] || [ "y" == "dualboot" ]; then
export skipbootpartition="y"
fi
if [ "y" == "windualboot" ]; then if [ "y" == "windualboot" ]; then
bootpartitionnummer=${m2ssd}1 bootpartitionnummer=${m2ssd}1
efipartitionnummer=${m2ssd}2 efipartitionnummer=${m2ssd}2
@ -1036,7 +1032,6 @@ function abfrage() {
fi fi
echo "ROOT-Partition = ${device}${rootpartitionnummer}" echo "ROOT-Partition = ${device}${rootpartitionnummer}"
# #
read -p "Are all the details correct ?: [y/N] " sicherheitsabfrage read -p "Are all the details correct ?: [y/N] " sicherheitsabfrage
if [ "$sicherheitsabfrage" != "y" ] if [ "$sicherheitsabfrage" != "y" ]
@ -1124,7 +1119,7 @@ then
echo "Partitions with UEFI" echo "Partitions with UEFI"
if [ "y" != "noinstall" ]; then if [ "y" != "noinstall" ]; then
if [ "y" == "windualboot" ] || [ "y" == "dualboot" ]; then if [ "y" == "skipbootpartition" ]; then
partitionieredual partitionieredual
else else
partitioniere partitioniere
@ -1157,15 +1152,10 @@ then
elif [ "${Partition}" == "bios" ]; then elif [ "${Partition}" == "bios" ]; then
echo "Partitions with MBR" echo "Partitions with MBR"
if [ "y" != "noinstall" ]; then if [ "y" != "noinstall" ]; then
if [ "${skipbootpartition}" == "y" ] && [ "${swap}" != "n" ]; then if [ "y" == "skipbootpartition" ]; then
partitioniereonepartitionmitswap partitionieredual
elif [ "${skipbootpartition}" == "y" ]; then
partitioniereonepartition
elif [ "${swap}" != "n" ]; then
echo "Create additional swap partition"
partionierenmitswap
else else
partionierenohneswap partitioniere
fi fi
else else
if [ "${verschluesselung}" == "y" ]; then if [ "${verschluesselung}" == "y" ]; then