Fix unterminated sed command + fix efi mount

This commit is contained in:
Tobias Strobel 2022-09-11 18:44:26 +02:00
parent 674ba9ff12
commit e0384b9d27

View file

@ -167,7 +167,7 @@ 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/tmp mount -t btrfs -o subvol=tmp,$o_btrfs LABEL=system /mnt/var/tmp
mount LABEL=EFI /mnt/efi mount -o $o LABEL=EFI /mnt/efi
echo -e "\n### Configuring custom repo" echo -e "\n### Configuring custom repo"
mkdir "/mnt/var/cache/pacman/${user}-local" mkdir "/mnt/var/cache/pacman/${user}-local"
@ -251,7 +251,7 @@ pacstrap /mnt base base-devel arch-secure-boot chezmoi ${all_packages[@]}
echo -e "\n### Generating base config files" echo -e "\n### Generating base config files"
genfstab -L -p /mnt >> /mnt/etc/fstab genfstab -L -p /mnt >> /mnt/etc/fstab
sed -i "s+LABEL=swap+/dev/mapper/swap" /mnt/etc/fstab sed -i "s+LABEL=swap+/dev/mapper/swap+" /mnt/etc/fstab
echo "cryptswap /dev/disk/by-partlabel/cryptswap /dev/urandom swap,cipher=aes-xts-plain64,size=256" >> /mnt/etc/crypttab echo "cryptswap /dev/disk/by-partlabel/cryptswap /dev/urandom swap,cipher=aes-xts-plain64,size=256" >> /mnt/etc/crypttab
systemd-nspawn -bD /mnt systemd-nspawn -bD /mnt