From 1def94b43ca631a1d743490fe269c7fc68861fb4 Mon Sep 17 00:00:00 2001
From: N <noel.mcloughlin@gmail.com>
Date: Sat, 5 Oct 2019 16:38:06 +0100
Subject: [PATCH] fix(jinja): fix generated iscsi.conf
---
iscsi/initiator/config/files/default/iscsi.tmpl | 1 +
iscsi/initiator/config/files/default/open-iscsi.tmpl | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/iscsi/initiator/config/files/default/iscsi.tmpl b/iscsi/initiator/config/files/default/iscsi.tmpl
index 9efc3bb1..d3a68f5c 100644
--- a/iscsi/initiator/config/files/default/iscsi.tmpl
+++ b/iscsi/initiator/config/files/default/iscsi.tmpl
@@ -16,6 +16,7 @@
{%- if value is mapping %}
{{shift}}{{ key }} { # nickname
{{ readconf(value, spaces|int+4) }}
+}
{%- elif value is string or value is number %}
{{shift}}{{ key }} = {{"'" if value is not string else ''}}{{ value }}{{"'" if value is not string else ''}}
{% endif %}
diff --git a/iscsi/initiator/config/files/default/open-iscsi.tmpl b/iscsi/initiator/config/files/default/open-iscsi.tmpl
index 67c1829d..e09a4dbb 100644
--- a/iscsi/initiator/config/files/default/open-iscsi.tmpl
+++ b/iscsi/initiator/config/files/default/open-iscsi.tmpl
@@ -13,8 +13,8 @@
{%- macro openiscsi(key, value, spaces=0) -%}
{%- set shift = spaces * ' ' -%}
-{{shift}}{{ key }} = {{"'" if value is not string else ''}}{{ value }}{{"'" if value is not string else ''}}
-{%- endmacro -%}
+{{shift}}{{ key }} = {{ value ~ '\n' if value is string else '"' ~ value ~ '"\n' }}
+{%- endmacro %}
{{ readconf(data, 0) }}