Skip to content
Snippets Groups Projects
Commit efd3dcf1 authored by Pietsch, Martin's avatar Pietsch, Martin
Browse files

change separators in export-expressions and added flags to disk partitions

parent 1c57448c
No related branches found
No related tags found
No related merge requests found
...@@ -14,7 +14,7 @@ export TIMEZONE="{{ hostobj.timezone | default("GMT") }}" ...@@ -14,7 +14,7 @@ export TIMEZONE="{{ hostobj.timezone | default("GMT") }}"
{% if 'partitions' in disk %} {% if 'partitions' in disk %}
{{ 'declare -a DISK_%s_PARTITIONS=()' | format(disk.device | upper) }} {{ 'declare -a DISK_%s_PARTITIONS=()' | format(disk.device | upper) }}
{% for part in disk.partitions %} {% 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 %} {% endfor %}
{{ 'export DISK_%s_PARTITIONS' | format(disk.device | upper) }} {{ 'export DISK_%s_PARTITIONS' | format(disk.device | upper) }}
{% endif %} {% endif %}
...@@ -62,7 +62,7 @@ export DISK_DEVICES ...@@ -62,7 +62,7 @@ export DISK_DEVICES
{% set ifresdata.ipv6_prefix = hostobj.network.classes[ifdata.class].ipv6.prefix %} {% set ifresdata.ipv6_prefix = hostobj.network.classes[ifdata.class].ipv6.prefix %}
{% endif %} {% endif %}
{% 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)) %} {% do netifs.append('"%s"' | format(ifname)) %}
{% endfor %} {% endfor %}
declare -a NETIF_DEVICES=({{ netifs | join(" ") }}) declare -a NETIF_DEVICES=({{ netifs | join(" ") }})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment