diff options
| author | HimbeerserverDE <himbeerserverde@gmail.com> | 2023-10-05 16:52:37 +0200 |
|---|---|---|
| committer | HimbeerserverDE <himbeerserverde@gmail.com> | 2023-10-05 16:52:37 +0200 |
| commit | 49ad44d0a3f9ec9523b25d7209bcb693293b8beb (patch) | |
| tree | d685f3e23ea1ab0e5a08b28ce7654c881df351b5 | |
| parent | cfa5fc47b360370ec8ae51a2e0dbda3dd231a350 (diff) | |
uefiinstall: get ready for transition to uki booting
| -rwxr-xr-x | uefiinstall | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/uefiinstall b/uefiinstall index 1fb8d41..5da8610 100755 --- a/uefiinstall +++ b/uefiinstall @@ -15,7 +15,6 @@ pacman -S --needed --noconfirm parted fzf # DRIVE=$1 -TARGET=$2 if [ -z "${DRIVE}" ]; then DRIVE="/dev/$(lsblk | grep disk | fzf --disabled | awk '{print $1}')" @@ -27,34 +26,22 @@ else PART_PREFIX="${DRIVE}" fi -if [ -z "${TARGET}" ]; then - TARGET=$(echo "Enter GRUB target (commonly x86_64-efi): " | fzf --disabled --print-query | sed -n '1 p') -fi - -# Needed because otherwise the disk might be overwritten -# without installing a bootable system. -if [ -z "${TARGET}" ]; then - echo -e "\e[1m\e[1;31mGRUB target must not be empty.\e[0m" - exit 1 -fi - parted -s ${DRIVE} mklabel gpt parted -s -a optimal ${DRIVE} mkpart primary fat32 0% 256MiB -parted -s -a optimal ${DRIVE} mkpart primary ext4 256MiB 512MiB -parted -s -a optimal ${DRIVE} mkpart primary btrfs 512MiB 100% +parted -s -a optimal ${DRIVE} mkpart primary btrfs 256MiB 100% mkfs.fat -F 32 ${PART_PREFIX}1 && fatlabel ${PART_PREFIX}1 ESP -mkfs.ext4 -F -L BOOT ${PART_PREFIX}2 -mkfs.btrfs -f ${PART_PREFIX}3 +mkfs.btrfs -f ${PART_PREFIX}2 mkdir /btrfs -mount -o compress=zstd ${PART_PREFIX}3 /btrfs +mount -o compress=zstd ${PART_PREFIX}2 /btrfs +btrfs subvolume create /btrfs/boot btrfs subvolume create /btrfs/root umount /btrfs -mount -o compress=zstd,subvol=/root ${PART_PREFIX}3 /mnt +mount -o compress=zstd,subvol=/root ${PART_PREFIX}2 /mnt mkdir /mnt/boot -mount ${PART_PREFIX}2 /mnt/boot +mount -o compress=zstd,subvol=/boot ${PART_PREFIX}2 /mnt/boot mkdir /mnt/boot/efi mount ${PART_PREFIX}1 /mnt/boot/efi @@ -63,7 +50,7 @@ rc-service ntpd start basestrap /mnt base openrc elogind-openrc vim man ntp-openrc git basestrap /mnt linux linux-firmware -artix-chroot /mnt bash -c "curl -fsSL https://raw.githubusercontent.com/HimbeerserverDE/artixinstall/main/mkuefi | sh -s -- ${DRIVE} ${PART_PREFIX} ${TARGET}" +artix-chroot /mnt bash -c "curl -fsSL https://raw.githubusercontent.com/HimbeerserverDE/artixinstall/main/mkuefi | sh -s -- ${DRIVE} ${PART_PREFIX}" fstabgen -U /mnt >> /mnt/etc/fstab |