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:45:20 +02:00
parent bf89b38161
commit 1350c842d9
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
arch-install
View file

@ -167,7 +167,8 @@ function partioniere() {
function partitionieredual() { function partitionieredual() {
if blkid -s PARTUUID -o value ${device}${rootpartitionnummer}; then if blkid -s PARTUUID -o value ${device}${rootpartitionnummer}; then
echo "entferne partition" echo "entferne partition ${device}${rootpartitionnummer}"
sleep 10
sgdisk -d ${rootpartitionnummer} ${device} sgdisk -d ${rootpartitionnummer} ${device}
fi fi
sgdisk -a 2048 -n ${rootpartitionnummer}:: -c ${rootpartitionnummer}:"Linux filesystem" -t ${rootpartitionnummer}:8300 ${device} sgdisk -a 2048 -n ${rootpartitionnummer}:: -c ${rootpartitionnummer}:"Linux filesystem" -t ${rootpartitionnummer}:8300 ${device}
@ -1013,7 +1014,7 @@ function abfrage() {
echo "Keine Installation: ${noinstall}" echo "Keine Installation: ${noinstall}"
fi fi
if [ "y" == "windualboot" ]; then if [ "y" == "${windualboot}" ]; then
bootpartitionnummer=${m2ssd}1 bootpartitionnummer=${m2ssd}1
efipartitionnummer=${m2ssd}2 efipartitionnummer=${m2ssd}2
if [ "${swap}" != "n" ]; then if [ "${swap}" != "n" ]; then
@ -1022,7 +1023,7 @@ function abfrage() {
else else
rootpartitionnummer=${m2ssd}5 rootpartitionnummer=${m2ssd}5
fi fi
elif [ "y" == "dualboot" ]; then elif [ "y" == "${dualboot}" ]; then
bootpartitionnummer=${m2ssd}1 bootpartitionnummer=${m2ssd}1
efipartitionnummer=${m2ssd}2 efipartitionnummer=${m2ssd}2
if [ "${swap}" != "n" ]; then if [ "${swap}" != "n" ]; then
@ -1129,7 +1130,7 @@ fi
# #
echo "A purge stops the chance of installing on the system." echo "A purge stops the chance of installing on the system."
echo "It may take a while!" echo "It may take a while!"
if [ "y" != "noinstall" ]; then if [ "y" != "noinstall" ] || [ "y" != "${skipbootpartition}" ]; then
dd if=/dev/zero of=${device} bs=64M count=10 status=progress dd if=/dev/zero of=${device} bs=64M count=10 status=progress
fi fi
# #
@ -1137,8 +1138,8 @@ if [ "${Partition}" == "uefi" ]
then then
echo "Partitions with UEFI" echo "Partitions with UEFI"
if [ "y" != "noinstall" ]; then if [ "y" != "${noinstall}" ]; then
if [ "y" == "skipbootpartition" ]; then if [ "y" == "${skipbootpartition}" ]; then
partitionieredual partitionieredual
else else
partitioniere partitioniere
@ -1170,8 +1171,8 @@ then
echo "Finished" echo "Finished"
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 [ "y" == "skipbootpartition" ]; then if [ "y" == "${skipbootpartition}" ]; then
partitionieredual partitionieredual
else else
partitioniere partitioniere