From 69da85019ed5f1011e5611529ddd1af2bdee3a72 Mon Sep 17 00:00:00 2001 From: AJ Schroeder <6432150+ajschroeder@users.noreply.github.com> Date: Mon, 15 Jan 2024 10:43:46 -0600 Subject: [PATCH] whitespace fixes --- .../centos/8-stream/data/storage.pkrtpl.hcl | 54 +++++++++---------- .../centos/9-stream/data/storage.pkrtpl.hcl | 54 +++++++++---------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/builds/linux/centos/8-stream/data/storage.pkrtpl.hcl b/builds/linux/centos/8-stream/data/storage.pkrtpl.hcl index 19f84ea..d048cf0 100644 --- a/builds/linux/centos/8-stream/data/storage.pkrtpl.hcl +++ b/builds/linux/centos/8-stream/data/storage.pkrtpl.hcl @@ -12,55 +12,55 @@ clearpart --all --initlabel ### Modify partition sizes for the virtual machine hardware. ### Create primary system partitions. -%{~ if length(partitions) == 1 && partitions[0].name == "autopart" ~} - %{~ if partitions[0].format.fstype == "lvm" ~} +%{ if length(partitions) == 1 && partitions[0].name == "autopart" ~} + %{ if partitions[0].format.fstype == "lvm" ~} autopart --type=lvm %{ endif } - %{~ if partitions[0].format.fstype == "simple" ~} + %{ if partitions[0].format.fstype == "simple" ~} autopart --type=plain %{ endif } - %{~ if partitions[0].format.fstype == "" ~} + %{ if partitions[0].format.fstype == "" ~} autopart --type=plain %{ endif } %{ else } - %{~ for partition in partitions ~} - %{~ if partition.format.fstype == "swap" ~} + %{ for partition in partitions ~} + %{ if partition.format.fstype == "swap" ~} part swap --size=${partition.size} - %{~ endif ~} - %{~ if partition.mount.path == "/boot/efi" ~} + %{ endif ~} + %{ if partition.mount.path == "/boot/efi" ~} part ${partition.mount.path} --fstype vfat --size=${partition.size} --label=${partition.format.label} - %{~ endif ~} - %{~ if partition.mount.path != "" ~} + %{ endif ~} + %{ if partition.mount.path != "" ~} part ${partition.mount.path} --fstype ${partition.format.fstype} --size=${partition.size} --label=${partition.format.label} %{~ if partition.mount.options != "" ~}--fsoptions="${partition.mount.options}"%{~ endif ~} - %{~ endif ~} - %{~ if partition.volume_group != "" ~} - %{~ if partition.size == -1 ~} + %{ endif ~} + %{ if partition.volume_group != "" ~} + %{ if partition.size == -1 ~} part pv.${partition.volume_group} --size=100 --grow - %{~ else ~} + %{ else ~} part pv.${partition.volume_group} --size=${partition.size} - %{~ endif ~} + %{ endif ~} ### Create a logical volume management (LVM) group. ### Modify logical volume sizes for the virtual machine hardware. - %{~ for index, volume_group in lvm ~} - %{~ if partition.volume_group != "" ~} + %{ for index, volume_group in lvm ~} + %{ if partition.volume_group != "" ~} volgroup ${volume_group.name} --pesize=4096 pv.${partition.volume_group} - %{~ endif ~} + %{ endif ~} ### Create logical volumes. - %{~ for partition in volume_group.partitions ~} - %{~ if partition.format.fstype == "swap" ~} + %{ for partition in volume_group.partitions ~} + %{ if partition.format.fstype == "swap" ~} logvol swap --fstype ${partition.format.fstype} --name=${partition.name} --vgname=${volume_group.name} --size=${partition.size} --label=${partition.format.label} - %{~ else ~} + %{ else ~} logvol ${partition.mount.path} %{ if partition.format.fstype == "fat32" } --fstype vfat %{ else } --fstype ${partition.format.fstype} %{ endif } %{ if partition.size != -1 } --size=${partition.size} %{ else } --size=100 --grow %{ endif } --name=${partition.name} --vgname=${volume_group.name} --label=${partition.format.label} %{ if partition.mount.options != "" ~} --fsoptions="${partition.mount.options}" %{~ endif ~} - %{~ endif ~} - %{~ endfor ~} - %{~ endfor ~} - %{~ endif ~} - %{~ endfor ~} -%{~ endif } + %{ endif ~} + %{ endfor ~} + %{ endfor ~} + %{ endif ~} + %{ endfor ~} +%{ endif } diff --git a/builds/linux/centos/9-stream/data/storage.pkrtpl.hcl b/builds/linux/centos/9-stream/data/storage.pkrtpl.hcl index 19f84ea..d048cf0 100644 --- a/builds/linux/centos/9-stream/data/storage.pkrtpl.hcl +++ b/builds/linux/centos/9-stream/data/storage.pkrtpl.hcl @@ -12,55 +12,55 @@ clearpart --all --initlabel ### Modify partition sizes for the virtual machine hardware. ### Create primary system partitions. -%{~ if length(partitions) == 1 && partitions[0].name == "autopart" ~} - %{~ if partitions[0].format.fstype == "lvm" ~} +%{ if length(partitions) == 1 && partitions[0].name == "autopart" ~} + %{ if partitions[0].format.fstype == "lvm" ~} autopart --type=lvm %{ endif } - %{~ if partitions[0].format.fstype == "simple" ~} + %{ if partitions[0].format.fstype == "simple" ~} autopart --type=plain %{ endif } - %{~ if partitions[0].format.fstype == "" ~} + %{ if partitions[0].format.fstype == "" ~} autopart --type=plain %{ endif } %{ else } - %{~ for partition in partitions ~} - %{~ if partition.format.fstype == "swap" ~} + %{ for partition in partitions ~} + %{ if partition.format.fstype == "swap" ~} part swap --size=${partition.size} - %{~ endif ~} - %{~ if partition.mount.path == "/boot/efi" ~} + %{ endif ~} + %{ if partition.mount.path == "/boot/efi" ~} part ${partition.mount.path} --fstype vfat --size=${partition.size} --label=${partition.format.label} - %{~ endif ~} - %{~ if partition.mount.path != "" ~} + %{ endif ~} + %{ if partition.mount.path != "" ~} part ${partition.mount.path} --fstype ${partition.format.fstype} --size=${partition.size} --label=${partition.format.label} %{~ if partition.mount.options != "" ~}--fsoptions="${partition.mount.options}"%{~ endif ~} - %{~ endif ~} - %{~ if partition.volume_group != "" ~} - %{~ if partition.size == -1 ~} + %{ endif ~} + %{ if partition.volume_group != "" ~} + %{ if partition.size == -1 ~} part pv.${partition.volume_group} --size=100 --grow - %{~ else ~} + %{ else ~} part pv.${partition.volume_group} --size=${partition.size} - %{~ endif ~} + %{ endif ~} ### Create a logical volume management (LVM) group. ### Modify logical volume sizes for the virtual machine hardware. - %{~ for index, volume_group in lvm ~} - %{~ if partition.volume_group != "" ~} + %{ for index, volume_group in lvm ~} + %{ if partition.volume_group != "" ~} volgroup ${volume_group.name} --pesize=4096 pv.${partition.volume_group} - %{~ endif ~} + %{ endif ~} ### Create logical volumes. - %{~ for partition in volume_group.partitions ~} - %{~ if partition.format.fstype == "swap" ~} + %{ for partition in volume_group.partitions ~} + %{ if partition.format.fstype == "swap" ~} logvol swap --fstype ${partition.format.fstype} --name=${partition.name} --vgname=${volume_group.name} --size=${partition.size} --label=${partition.format.label} - %{~ else ~} + %{ else ~} logvol ${partition.mount.path} %{ if partition.format.fstype == "fat32" } --fstype vfat %{ else } --fstype ${partition.format.fstype} %{ endif } %{ if partition.size != -1 } --size=${partition.size} %{ else } --size=100 --grow %{ endif } --name=${partition.name} --vgname=${volume_group.name} --label=${partition.format.label} %{ if partition.mount.options != "" ~} --fsoptions="${partition.mount.options}" %{~ endif ~} - %{~ endif ~} - %{~ endfor ~} - %{~ endfor ~} - %{~ endif ~} - %{~ endfor ~} -%{~ endif } + %{ endif ~} + %{ endfor ~} + %{ endfor ~} + %{ endif ~} + %{ endfor ~} +%{ endif }