From ea760d3fe5feab7f8acdaefa4ee9e74905804812 Mon Sep 17 00:00:00 2001 From: juanmont Date: Mon, 16 Apr 2018 16:07:06 +0200 Subject: [PATCH] B #1960: Follow the value of the persistent attribute in the Image template. --- src/image/Image.cc | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/image/Image.cc b/src/image/Image.cc index 005557172c..518160141f 100644 --- a/src/image/Image.cc +++ b/src/image/Image.cc @@ -891,18 +891,19 @@ bool Image::test_set_persistent(Template * image_template, int uid, int gid, } int rc = nd.get_configuration_attribute(uid, gid, conf_name, per_oned); - - if ( rc != 0 || per_oned.empty() ) //No DEFAULT_* defined or empty value + + bool has_persistent = image_template->get("PERSISTENT", persistent); + + if ( rc == 0 && !has_persistent ) { - image_template->get("PERSISTENT", persistent); - } - else if ( rc == 0 && one_util::toupper(per_oned) == "YES" ) - { - persistent = true; - } - else - { - persistent = false; + if ( one_util::toupper(per_oned) == "YES" ) + { + persistent = true; + } + else if ( one_util::toupper(per_oned) == "NO" ) + { + persistent = false; + } } image_template->replace("PERSISTENT", persistent);