summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2013-01-09 12:14:24 +0000
committerDaniel P. Berrange <berrange@redhat.com>2013-01-09 12:14:24 +0000
commit03aa038d533a1a004d864740530fac9433f5e10e (patch)
tree91043545fff70e4cd4880aa510c2cd1698bac2e5
parentcba1a3faf83a380caa99782ed8e69487777af901 (diff)
Revert "Use OS-specific config in OsinfoInstallScript"
-rw-r--r--osinfo/osinfo_install_script.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
index 70d6b1d..0591708 100644
--- a/osinfo/osinfo_install_script.c
+++ b/osinfo/osinfo_install_script.c
@@ -637,15 +637,9 @@ static xmlNodePtr osinfo_install_script_generate_entity_config(OsinfoInstallConf
tmp1 = keys = osinfo_entity_get_param_keys(entity);
while (tmp1) {
- GList *values;
- GList *tmp2;
-
- if (OSINFO_IS_INSTALL_CONFIG(entity))
- values = osinfo_install_config_get_param_value_list(OSINFO_INSTALL_CONFIG(entity), tmp1->data);
- else
- values = osinfo_entity_get_param_value_list(entity, tmp1->data);
+ GList *values = osinfo_entity_get_param_value_list(entity, tmp1->data);
+ GList *tmp2 = values;
- tmp2 = values;
while (tmp2) {
if (!(data = xmlNewDocNode(NULL, NULL, (const xmlChar*)tmp1->data,
(const xmlChar*)tmp2->data))) {