From ae96f4eaf0ee3c50ce9308d0ea1727e9f7a230c7 Mon Sep 17 00:00:00 2001 From: Vlastimil Holer Date: Fri, 19 May 2017 16:54:03 +0200 Subject: [PATCH] B #3705: Don't override image DRIVER if CDROM --- src/datastore/Datastore.cc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/datastore/Datastore.cc b/src/datastore/Datastore.cc index aa7830a117..899c23c3cd 100644 --- a/src/datastore/Datastore.cc +++ b/src/datastore/Datastore.cc @@ -107,6 +107,7 @@ void Datastore::disk_attribute( string st; string inherit_val; string current_val; + string type; vector::const_iterator it; @@ -148,11 +149,16 @@ void Datastore::disk_attribute( disk->replace("DISK_TYPE", Image::disk_type_to_str(get_disk_type())); } - get_template_attribute("DRIVER", st); + type = disk->vector_value("TYPE"); - if(!st.empty()) + if (type != "CDROM") { - disk->replace("DRIVER", st); + get_template_attribute("DRIVER", st); + + if(!st.empty()) + { + disk->replace("DRIVER", st); + } } }