X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fhooks%2Fpartition.DEFAULT;h=5d4684c6bf79af7c3bbe6a00dc196885b7505380;hb=e8f685f09f4190d1afabf25d6d7ac2f7e5dec841;hp=c4514c500cf7d6afc50bfd7dd6198ac4767aa849;hpb=3962448edf08228464cb1ad72095935f3308a3f8;p=automated-distro-installer

diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT
index c4514c5..5d4684c 100755
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -48,7 +48,7 @@ devs=(${letters[@]/#//dev/${d}})
 crypt_devs=(${letters[@]/#//dev/mapper/crypt_dev_${d}})
 first_boot_dev=${devs[0]}$bootn
 
-partition=false
+partition=true
 
 # somewhat crude detection of whether to partition
 for dev in ${devs[@]}; do
@@ -99,12 +99,13 @@ if $partition; then
         parted -s $dev mklabel gpt
         # gpt ubuntu cloud image uses ~4. fai uses 1 MiB. ehh, i'll do 4.
         # also, using MB instead of MiB causes complains about alignment.
-        parted -s $dev mkpart primary "ext3" 4MB ${boot_end}MiB
-        parted -s $dev mkpart primary "linux-swap" ${boot_end}MiB ${swap_end}MiB
-        parted -s -- $dev mkpart primary "" ${swap_end}MiB -0
-        parted -s $dev mkpart primary "" 1MiB 4MiB
-        parted -s $dev set $bios_grubn bios_grub on
-        parted -s $dev set $bootn boot on # generally not needed on modern systems
+        pcmd="parted -a optimal -s -- $dev"
+        $pcmd mkpart primary "ext3" 4MB ${boot_end}MiB
+        $pcmd mkpart primary "linux-swap" ${boot_end}MiB ${swap_end}MiB
+        $pcmd mkpart primary "" ${swap_end}MiB -0
+        $pcmd mkpart primary "" 1MiB 4MiB
+        $pcmd set $bios_grubn bios_grub on
+        $pcmd set $bootn boot on # generally not needed on modern systems
         # the mkfs failed randomly on a vm, so I threw a sleep in here.
         sleep .1