Macintosh-SW/EMILE
1
0
Fork 0
mirror of https://github.com/vivier/EMILE.git synced 2024-12-22 10:29:31 +00:00
Code Issues Projects Releases Wiki Activity

tools correctly get vga, modem and printer properties

Browse Source
This commit is contained in:
Laurent Vivier 2007-09-08 23:31:40 +00:00
parent fb677da2fe
commit 880d7d25fd
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/emile-install.c
View File

@ -197,6 +197,7 @@ static int set_config(char *image, int verbose, char *config_path,
int gestaltid; int gestaltid;
int default_entry; int default_entry;
char *title, *args; char *title, *args;
char *output;
char buf[64]; char buf[64];
int fd; int fd;
@ -254,14 +255,14 @@ static int set_config(char *image, int verbose, char *config_path,
config_set_property(configuration, "timeout", buf); config_set_property(configuration, "timeout", buf);
} }
if (!emile_config_get(config, CONFIG_VGA, buf)) if (!emile_config_get(config, CONFIG_VGA, &output))
config_set_property(configuration, "vga", buf); config_set_property(configuration, "vga", output);
if (!emile_config_get(config, CONFIG_MODEM, buf)) if (!emile_config_get(config, CONFIG_MODEM, &output))
config_set_property(configuration, "modem", buf); config_set_property(configuration, "modem", output);
if (!emile_config_get(config, CONFIG_PRINTER, buf)) if (!emile_config_get(config, CONFIG_PRINTER, &output))
config_set_property(configuration, "printer", buf); config_set_property(configuration, "printer", output);
kernel_ondisk = NULL; kernel_ondisk = NULL;
ramdisk_ondisk = NULL; ramdisk_ondisk = NULL;

15
tools/emile.c
View File

@ -416,6 +416,7 @@ static int8_t *set_config(emile_config *config, int drive)
char *initrd_path; char *initrd_path;
char *kernel_map_path; char *kernel_map_path;
char *initrd_map_path; char *initrd_map_path;
char *output;
char *append_string; char *append_string;
char *title; char *title;
char buf[16]; char buf[16];
@ -450,16 +451,14 @@ static int8_t *set_config(emile_config *config, int drive)
config_set_property(configuration, "timeout", buf); config_set_property(configuration, "timeout", buf);
} }
if (!emile_config_get(config, CONFIG_VGA, buf)) if (!emile_config_get(config, CONFIG_VGA, &output))
config_set_property(configuration, "vga", buf); config_set_property(configuration, "vga", output);
else
config_set_property(configuration, "vga", "default");
if (!emile_config_get(config, CONFIG_MODEM, buf)) if (!emile_config_get(config, CONFIG_MODEM, &output))
config_set_property(configuration, "modem", buf); config_set_property(configuration, "modem", output);
if (!emile_config_get(config, CONFIG_PRINTER, buf)) if (!emile_config_get(config, CONFIG_PRINTER, &output))
config_set_property(configuration, "printer", buf); config_set_property(configuration, "printer", output);
emile_config_read_first_entry(config); emile_config_read_first_entry(config);