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-04-05 20:39:14 +02:00
parent bbd97191a7
commit a46a2cd646
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
arch-install
View file

@ -80,6 +80,14 @@ function secureumount() {
} }
function formatencrypt() {
if [ "${verschluesselung}" == "y" ]; then
echo "Please write big YES"
cryptsetup -c aes-xts-plain64 -y -s 512 luksFormat ${device}${rootpartitionnummer}
fi
}
function partionierenmitswap() { function partionierenmitswap() {
wipefs -a -f ${device} wipefs -a -f ${device}
sgdisk -o ${device} sgdisk -o ${device}
@ -87,13 +95,7 @@ function partionierenmitswap() {
sgdisk -a 2048 -n 2::+1G -c 2:"EFI Boot Partition" -t 2:ef00 ${device} sgdisk -a 2048 -n 2::+1G -c 2:"EFI Boot Partition" -t 2:ef00 ${device}
sgdisk -a 2048 -n 3::+8G -c 3:"Linux swap" -t 3:8200 ${device} sgdisk -a 2048 -n 3::+8G -c 3:"Linux swap" -t 3:8200 ${device}
sgdisk -a 2048 -n 4:: -c 4:"Linux filesystem" -t 4:8300 ${device} sgdisk -a 2048 -n 4:: -c 4:"Linux filesystem" -t 4:8300 ${device}
formatencrypt
if [ "${verschluesselung}" == "y" ]; then
echo "Please write big YES"
cryptsetup -c aes-xts-plain64 -y -s 512 luksFormat ${device}${rootpartitionnummer}
cryptsetup luksOpen ${device}${rootpartitionnummer} luks0
deviceluks="/dev/mapper/luks0"
fi
} }
@ -103,14 +105,7 @@ function partionierenohneswap() {
sgdisk -a 2048 -n 1::+1024K -c 1:"BIOS Boot Partition" -t 1:ef02 ${device} sgdisk -a 2048 -n 1::+1024K -c 1:"BIOS Boot Partition" -t 1:ef02 ${device}
sgdisk -a 2048 -n 2::+1G -c 2:"EFI Boot Partition" -t 2:ef00 ${device} sgdisk -a 2048 -n 2::+1G -c 2:"EFI Boot Partition" -t 2:ef00 ${device}
sgdisk -a 2048 -n 3:: -c 3:"Linux filesystem" -t 3:8300 ${device} sgdisk -a 2048 -n 3:: -c 3:"Linux filesystem" -t 3:8300 ${device}
formatencrypt
if [ "${verschluesselung}" == "y" ]; then
echo "Please write big YES"
cryptsetup -c aes-xts-plain64 -y -s 512 luksFormat ${device}${rootpartitionnummer}
cryptsetup luksOpen ${device}${rootpartitionnummer} luks0
deviceluks="/dev/mapper/luks0"
fi
} }
@ -920,6 +915,8 @@ function abfrage() {
fi fi
fi fi
deviceluks="/dev/mapper/luks0"
echo "Boot-Partition = ${device}${bootpartitionnummer}" echo "Boot-Partition = ${device}${bootpartitionnummer}"
echo "EFI-Partition = ${device}${efipartitionnummer}" echo "EFI-Partition = ${device}${efipartitionnummer}"
if [ "${swap}" != "n" ]; then if [ "${swap}" != "n" ]; then
@ -1027,6 +1024,8 @@ then
else else
partionierenohneswap partionierenohneswap
fi fi
else
cryptsetup luksOpen ${device}${rootpartitionnummer} luks0
fi fi
echo "installation" echo "installation"
@ -1058,6 +1057,8 @@ elif [ "${Partition}" == "bios" ]; then
else else
partionierenohneswap partionierenohneswap
fi fi
else
cryptsetup luksOpen ${device}${rootpartitionnummer} luks0
fi fi
echo "installation" echo "installation"