From 048ad813679b0934932f37ce81bd24531d521127 Mon Sep 17 00:00:00 2001 From: Nathan Reiner Date: Sat, 25 Mar 2023 17:42:51 +0100 Subject: merge sfdisk commands --- nais | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nais b/nais index f5cd301..04c4d71 100755 --- a/nais +++ b/nais @@ -56,7 +56,6 @@ set_hostname() { install_arch() { if [ "$BOOT_MODE" = "bios" ]; then - sfdisk -X dos "/dev/$DISK" if echo "$DISK" | grep -E "[0-9]$"; then boot="/dev/${DISK}p1" root="/dev/${DISK}p2" @@ -64,9 +63,8 @@ install_arch() { boot="/dev/${DISK}1" root="/dev/${DISK}2" fi - printf ",4G,L\n,,L\nwrite\n" | sfdisk "/dev/$DISK" + printf ",4G,L\n,,L\nwrite\n" | sfdisk -X dos "/dev/$DISK" else - sfdisk -X gpt "/dev/$DISK" if echo "$DISK" | grep -E "[0-9]$"; then efi="/dev/${DISK}p1" boot="/dev/${DISK}p2" @@ -76,7 +74,7 @@ install_arch() { boot="/dev/${DISK}2" root="/dev/${DISK}3" fi - printf ",1G,U\n,4G,L\n,,L\nwrite\n" | sfdisk "/dev/$DISK" + printf ",1G,U\n,4G,L\n,,L\nwrite\n" | sfdisk -X gpt "/dev/$DISK" mkfs.fat -F 32 "$efi" fi -- cgit v1.2.3-70-g09d2