From 880d7d25fde13f891699fade88e8251eeef9d21c Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Sat, 8 Sep 2007 23:31:40 +0000 Subject: [PATCH] tools correctly get vga, modem and printer properties --- tools/emile-install.c | 13 +++++++------ tools/emile.c | 15 +++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tools/emile-install.c b/tools/emile-install.c index 8245ac2..f67c143 100644 --- a/tools/emile-install.c +++ b/tools/emile-install.c @@ -197,6 +197,7 @@ static int set_config(char *image, int verbose, char *config_path, int gestaltid; int default_entry; char *title, *args; + char *output; char buf[64]; int fd; @@ -254,14 +255,14 @@ static int set_config(char *image, int verbose, char *config_path, config_set_property(configuration, "timeout", buf); } - if (!emile_config_get(config, CONFIG_VGA, buf)) - config_set_property(configuration, "vga", buf); + if (!emile_config_get(config, CONFIG_VGA, &output)) + config_set_property(configuration, "vga", output); - if (!emile_config_get(config, CONFIG_MODEM, buf)) - config_set_property(configuration, "modem", buf); + if (!emile_config_get(config, CONFIG_MODEM, &output)) + config_set_property(configuration, "modem", output); - if (!emile_config_get(config, CONFIG_PRINTER, buf)) - config_set_property(configuration, "printer", buf); + if (!emile_config_get(config, CONFIG_PRINTER, &output)) + config_set_property(configuration, "printer", output); kernel_ondisk = NULL; ramdisk_ondisk = NULL; diff --git a/tools/emile.c b/tools/emile.c index 42704a5..8c1d064 100644 --- a/tools/emile.c +++ b/tools/emile.c @@ -416,6 +416,7 @@ static int8_t *set_config(emile_config *config, int drive) char *initrd_path; char *kernel_map_path; char *initrd_map_path; + char *output; char *append_string; char *title; char buf[16]; @@ -450,16 +451,14 @@ static int8_t *set_config(emile_config *config, int drive) config_set_property(configuration, "timeout", buf); } - if (!emile_config_get(config, CONFIG_VGA, buf)) - config_set_property(configuration, "vga", buf); - else - config_set_property(configuration, "vga", "default"); + if (!emile_config_get(config, CONFIG_VGA, &output)) + config_set_property(configuration, "vga", output); - if (!emile_config_get(config, CONFIG_MODEM, buf)) - config_set_property(configuration, "modem", buf); + if (!emile_config_get(config, CONFIG_MODEM, &output)) + config_set_property(configuration, "modem", output); - if (!emile_config_get(config, CONFIG_PRINTER, buf)) - config_set_property(configuration, "printer", buf); + if (!emile_config_get(config, CONFIG_PRINTER, &output)) + config_set_property(configuration, "printer", output); emile_config_read_first_entry(config);