aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Reiner <nathan@nathanreiner.xyz>2023-03-25 17:42:51 +0100
committerNathan Reiner <nathan@nathanreiner.xyz>2023-03-25 17:42:51 +0100
commit048ad813679b0934932f37ce81bd24531d521127 (patch)
treee909372e69af2f548aff0b80707886764b7b3010
parentbf0173a3e7ec2f78917d3dd170935a52e971e0a6 (diff)
merge sfdisk commands
-rwxr-xr-xnais6
1 files 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