X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fhooks%2Fpartition.DEFAULT;h=36f858ca2350ca72969fb9151bfb8fd0953a68e9;hb=fd92920315ea1ec28049041f74011324c750c667;hp=18f5a23a39f453d152c34a1d555b20b0d720761d;hpb=936324619541130f4ab07bd4633f48eb81812613;p=automated-distro-installer diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT index 18f5a23..36f858c 100755 --- a/fai/config/hooks/partition.DEFAULT +++ b/fai/config/hooks/partition.DEFAULT @@ -714,6 +714,8 @@ if [[ ! $DISTRO ]]; then DISTRO=ubuntufocal elif ifclass VOL_JAMMY; then DISTRO=ubuntujammy + elif ifclass VOL_NOBLE; then + DISTRO=ubuntunoble elif ifclass VOL_FLIDAS; then DISTRO=trisquelflidas elif ifclass VOL_ETIONA; then @@ -722,6 +724,8 @@ if [[ ! $DISTRO ]]; then DISTRO=trisquelnabia elif ifclass VOL_ARAMO; then DISTRO=trisquelaramo + elif ifclass VOL_ECNE; then + DISTRO=trisquelecne elif $mkroot2 || $mkroot2tab; then : else @@ -880,15 +884,19 @@ if $partition; then if fsf; then root_mib=40000 + elif ifclass demohost; then + # just randomish numbers that seem ok for testing. + root_mib=25000 + o_mib=1000 else # This would maximize it, but we are going for a separate filesystem in /o, # so use fixed sizes to allow both to grow # 600 = uefi 512 + grubext 8 + bios grub 3 + some extra cuz this is lvm #root_mib=$(( disk_mib - root2_part_mib - swap_mib - boot_part_mib - boot2_part_mib - 600 )) - o_mib=$(( 120 * 1000 )) + o_mib=$(( 180 * 1000 )) # max minus o, minus a gig just for some extra space max_root_mib=$(( disk_mib - root2_part_mib - swap_mib - boot_part_mib - boot2_part_mib - 600 - o_mib - 1000 )) - root_mib=$(( 1000 * 1000 )) # * 1000 to make it in gb. + root_mib=$(( 1700 * 1000 )) # * 1000 to make it in gb. if (( max_root_mib < root_mib )); then root_mib=$max_root_mib fi