From 3f0110d54971cf11c0db2c3846385b7f99f37ef2 Mon Sep 17 00:00:00 2001 From: simono41 Date: Tue, 17 Jul 2018 17:29:52 +0200 Subject: [PATCH] fix --- arch-install | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/arch-install b/arch-install index 3c3f3e5..db11244 100755 --- a/arch-install +++ b/arch-install @@ -927,12 +927,12 @@ function abfrage() { [[ -z "${autostart}" ]] && autostart=n 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 for wort in ${extraparameter} do echo "$wort" export ${wort}="y" + echo "Extra-Parameter ${wort}=y" done # Ausgaben @@ -994,10 +994,6 @@ function abfrage() { m2ssd=p fi - if [ "y" == "windualboot" ] || [ "y" == "dualboot" ]; then - export skipbootpartition="y" - fi - if [ "y" == "windualboot" ]; then bootpartitionnummer=${m2ssd}1 efipartitionnummer=${m2ssd}2 @@ -1036,7 +1032,6 @@ function abfrage() { fi echo "ROOT-Partition = ${device}${rootpartitionnummer}" - # read -p "Are all the details correct ?: [y/N] " sicherheitsabfrage if [ "$sicherheitsabfrage" != "y" ] @@ -1124,7 +1119,7 @@ then echo "Partitions with UEFI" if [ "y" != "noinstall" ]; then - if [ "y" == "windualboot" ] || [ "y" == "dualboot" ]; then + if [ "y" == "skipbootpartition" ]; then partitionieredual else partitioniere @@ -1157,15 +1152,10 @@ then elif [ "${Partition}" == "bios" ]; then echo "Partitions with MBR" if [ "y" != "noinstall" ]; then - if [ "${skipbootpartition}" == "y" ] && [ "${swap}" != "n" ]; then - partitioniereonepartitionmitswap - elif [ "${skipbootpartition}" == "y" ]; then - partitioniereonepartition - elif [ "${swap}" != "n" ]; then - echo "Create additional swap partition" - partionierenmitswap + if [ "y" == "skipbootpartition" ]; then + partitionieredual else - partionierenohneswap + partitioniere fi else if [ "${verschluesselung}" == "y" ]; then