summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-02-25 21:44:38 +0100
committerChristian Poessinger <christian@poessinger.com>2022-02-25 21:44:38 +0100
commit2a67f7f1f918a03f23ceaa1205d8ef4eb4723f63 (patch)
tree8571d8340f12324672d2e637bba5b942b5406811
parente79dd73a258879b2fc59e0ada9a1d23551e37912 (diff)
downloadvyatta-cfg-system-2a67f7f1f918a03f23ceaa1205d8ef4eb4723f63.tar.gz
vyatta-cfg-system-2a67f7f1f918a03f23ceaa1205d8ef4eb4723f63.zip
Revert "install: T4262: Fix root partition size for UEFI installs"
This reverts commit 1155d46711d54c566b3171b94c6e1281ec3dadd0. This breaks non-UEFI installs
-rwxr-xr-xscripts/install/install-get-partition4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/install/install-get-partition b/scripts/install/install-get-partition
index f977f16b..c5c7c268 100755
--- a/scripts/install/install-get-partition
+++ b/scripts/install/install-get-partition
@@ -644,7 +644,7 @@ create_partitions() {
fi
if [ -d /sys/firmware/efi ]; then
#Need room for the EFI partition. 512 is standard, but 256 is probably okay here
- root_part_size=$((root_part_size - 256))M
+ root_part_size=$((root_part_size - 256))
##Do GPT/EFI Setup
sgdisk --zap-all /dev/$ldrive
@@ -653,7 +653,7 @@ create_partitions() {
# part3 = ROOT
sgdisk -a1 -n1:34:2047 -t1:EF02 \
-n2:2048:+256M -t2:EF00 \
- -n3:0:+$root_part_size -t3:8300 /dev/$ldrive
+ -n3:0:0:+$root_part_size -t3:8300 /dev/$ldrive
status=$?
if [ "$status" != 0 ]; then
echo -e "Error creating primary partition on $ldrive.\nPlease see $INSTALL_LOG for more details.\nExiting..."