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