From efd3dcf16fbfb8d203bbb87a06faae7c71a598e6 Mon Sep 17 00:00:00 2001
From: Martin Pietsch <martin.pietsch@tu-dresden.de>
Date: Fri, 11 Oct 2019 10:05:16 +0200
Subject: [PATCH] change separators in export-expressions and added flags to
disk partitions
---
templates/answerfile.j2 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/templates/answerfile.j2 b/templates/answerfile.j2
index 415f2e7..d78ccc2 100644
--- a/templates/answerfile.j2
+++ b/templates/answerfile.j2
@@ -14,7 +14,7 @@ export TIMEZONE="{{ hostobj.timezone | default("GMT") }}"
{% if 'partitions' in disk %}
{{ 'declare -a DISK_%s_PARTITIONS=()' | format(disk.device | upper) }}
{% for part in disk.partitions %}
-{{ 'DISK_%s_PARTITIONS+=("%s:%s:%s:%s:%s:%s:%s")' | format(disk.device | upper, part.size, part.fs, part.mountpoint | default(""), part.mountoptions | default("defaults"), part.dump | default("0"), part.pass | default("0"), part.format | default("true")) }}
+{{ 'DISK_%s_PARTITIONS+=("%s;%s;%s;%s;%s;%s;%s;%s")' | format(disk.device | upper, part.size, part.fs, part.mountpoint | default(""), part.mountoptions | default("defaults"), part.dump | default("0"), part.pass | default("0"), part.format | default("true")), (part.flags | default([])) | join(",") }}
{% endfor %}
{{ 'export DISK_%s_PARTITIONS' | format(disk.device | upper) }}
{% endif %}
@@ -62,7 +62,7 @@ export DISK_DEVICES
{% set ifresdata.ipv6_prefix = hostobj.network.classes[ifdata.class].ipv6.prefix %}
{% endif %}
{% endif %}
-{{ 'export NETIF_%s="%s:%s:%s:%s:%s"' | format(ifname | upper, ifresdata.ipv4_address, ifresdata.ipv4_netmask, ifresdata.ipv6_address, ifresdata.ipv6_prefix, ifdata.static | default("true")) }}
+{{ 'export NETIF_%s="%s;%s;%s;%s;%s"' | format(ifname | upper, ifresdata.ipv4_address, ifresdata.ipv4_netmask, ifresdata.ipv6_address, ifresdata.ipv6_prefix, ifdata.static | default("true")) }}
{% do netifs.append('"%s"' | format(ifname)) %}
{% endfor %}
declare -a NETIF_DEVICES=({{ netifs | join(" ") }})
--
GitLab