Fix bugs
This commit is contained in:
parent
143895bf01
commit
19a8aab7bd
1 changed files with 8 additions and 5 deletions
13
install.sh
13
install.sh
|
@ -111,10 +111,12 @@ device=$(get_choice "Installation" "Select installation disk" "${devicelist[@]}"
|
||||||
clear
|
clear
|
||||||
|
|
||||||
echo -e "\n### Setting up fastest mirrors"
|
echo -e "\n### Setting up fastest mirrors"
|
||||||
reflector --country 'Germany,France,' --protocol https --sort rate --save /etc/pacman.d/mirrorlist
|
reflector --country 'Germany,France' --protocol https --sort rate --latest 5 --save /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
echo -e "\n### Setting up partitions"
|
echo -e "\n### Setting up partitions"
|
||||||
umount -R /mnt 2> /dev/null || true
|
umount -R /mnt 2> /dev/null || true
|
||||||
|
swapoff --all
|
||||||
|
cryptsetup close swap 2> /dev/null || true
|
||||||
cryptsetup luksClose luks 2> /dev/null || true
|
cryptsetup luksClose luks 2> /dev/null || true
|
||||||
|
|
||||||
sgdisk --zap-all "${device}"
|
sgdisk --zap-all "${device}"
|
||||||
|
@ -123,10 +125,11 @@ sgdisk --clear \
|
||||||
--new=2:0:+8GiB --typecode=2:8200 --change-name=2:cryptswap \
|
--new=2:0:+8GiB --typecode=2:8200 --change-name=2:cryptswap \
|
||||||
--new=3:0:0 --typecode=3:8300 --change-name=3:cryptsystem \
|
--new=3:0:0 --typecode=3:8300 --change-name=3:cryptsystem \
|
||||||
"${device}"
|
"${device}"
|
||||||
|
partprobe "${device}"
|
||||||
|
|
||||||
echo -e "\n### Formatting partitions"
|
echo -e "\n### Formatting partitions"
|
||||||
# Boot partition
|
# Boot partition
|
||||||
mkfs.vfat -F 32 -n "EFI" /dev/disk/by-partlabel/EFI
|
mkfs.fat -F 32 -n "EFI" /dev/disk/by-partlabel/EFI
|
||||||
|
|
||||||
# Swap partition
|
# Swap partition
|
||||||
cryptsetup open --type plain --key-file /dev/urandom /dev/disk/by-partlabel/cryptswap swap
|
cryptsetup open --type plain --key-file /dev/urandom /dev/disk/by-partlabel/cryptswap swap
|
||||||
|
@ -142,7 +145,7 @@ echo -e "\n### Setting up BTRFS subvolumes"
|
||||||
o=defaults,x-mount.mkdir
|
o=defaults,x-mount.mkdir
|
||||||
o_btrfs=$o,compress=zstd,ssd,noatime
|
o_btrfs=$o,compress=zstd,ssd,noatime
|
||||||
|
|
||||||
mount -t btrfs LAEL=system /mnt
|
mount -t btrfs LABEL=system /mnt
|
||||||
btrfs subvolume create /mnt/@root
|
btrfs subvolume create /mnt/@root
|
||||||
btrfs subvolume create /mnt/@home
|
btrfs subvolume create /mnt/@home
|
||||||
btrfs subvolume create /mnt/@snapshots
|
btrfs subvolume create /mnt/@snapshots
|
||||||
|
@ -151,7 +154,7 @@ btrfs subvolume create /mnt/@aurbuild
|
||||||
btrfs subvolume create /mnt/@archbuild
|
btrfs subvolume create /mnt/@archbuild
|
||||||
btrfs subvolume create /mnt/@docker
|
btrfs subvolume create /mnt/@docker
|
||||||
btrfs subvolume create /mnt/@logs
|
btrfs subvolume create /mnt/@logs
|
||||||
btrfs subvolume create /mnt/@temp
|
btrfs subvolume create /mnt/@tmp
|
||||||
umount -R /mnt
|
umount -R /mnt
|
||||||
|
|
||||||
mount -t btrfs -o subvol=@root,$o_btrfs LABEL=system /mnt
|
mount -t btrfs -o subvol=@root,$o_btrfs LABEL=system /mnt
|
||||||
|
@ -162,7 +165,7 @@ mount -t btrfs -o subvol=@aurbuild,$o_btrfs LABEL=system /mnt/var/lib/aurbuild
|
||||||
mount -t btrfs -o subvol=@archbuild,$o_btrfs LABEL=system /mnt/var/lib/archbuild
|
mount -t btrfs -o subvol=@archbuild,$o_btrfs LABEL=system /mnt/var/lib/archbuild
|
||||||
mount -t btrfs -o subvol=@docker,$o_btrfs LABEL=system /mnt/var/lib/docker
|
mount -t btrfs -o subvol=@docker,$o_btrfs LABEL=system /mnt/var/lib/docker
|
||||||
mount -t btrfs -o subvol=@logs,$o_btrfs LABEL=system /mnt/var/log
|
mount -t btrfs -o subvol=@logs,$o_btrfs LABEL=system /mnt/var/log
|
||||||
mount -t btrfs -o subvol=@tmp,$o_btrfs LABEL=system /mnt/var/temp
|
mount -t btrfs -o subvol=@tmp,$o_btrfs LABEL=system /mnt/var/tmp
|
||||||
|
|
||||||
#mount LABEL=EFI /mnt/efi
|
#mount LABEL=EFI /mnt/efi
|
||||||
mount -o $o LABEL=EFI /mnt/boot
|
mount -o $o LABEL=EFI /mnt/boot
|
||||||
|
|
Loading…
Reference in a new issue