mirror of
https://github.com/vivier/EMILE.git
synced 2025-02-27 06:29:15 +00:00
add set_config() function
This commit is contained in:
parent
aeddb9f7e4
commit
869161fd15
@ -54,7 +54,8 @@ static void usage(int argc, char** argv)
|
||||
fprintf(stderr, " -k, --kernel kernel to copy to floppy\n");
|
||||
fprintf(stderr, " -r, --ramdisk ramdisk to copy to floppy\n");
|
||||
fprintf(stderr, " -g, --getinfo get information from <image>\n");
|
||||
fprintf(stderr, " -c, --config set configuration according to a config file\n");
|
||||
fprintf(stderr, " -c, --config "
|
||||
"set configuration according to a config file\n");
|
||||
fprintf(stderr, "\nbuild: \n%s\n", SIGNATURE);
|
||||
}
|
||||
|
||||
@ -176,72 +177,12 @@ static int get_info(char *image, int verbose)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int main(int argc, char** argv)
|
||||
static int set_config(char *image, int verbose, char *config_path,
|
||||
char *first_level, char *second_level)
|
||||
{
|
||||
int verbose = 0;
|
||||
int option_index = 0;
|
||||
char* first_level = NULL;
|
||||
char* second_level = NULL;
|
||||
char *ramdisk_ondisk, *kernel_ondisk;
|
||||
char* kernel_image = NULL;
|
||||
char* ramdisk = NULL;
|
||||
char* image = NULL;
|
||||
char* config_path = NULL;
|
||||
char *ramdisk_ondisk, *kernel_ondisk;
|
||||
int action_getinfo = 0;
|
||||
int c;
|
||||
int ret;
|
||||
|
||||
while(1)
|
||||
{
|
||||
c = getopt_long(argc, argv, "hvf:s:k:r:gc:", long_options,
|
||||
&option_index);
|
||||
if (c == -1)
|
||||
break;
|
||||
switch(c)
|
||||
{
|
||||
case ARG_HELP:
|
||||
usage(argc, argv);
|
||||
return 0;
|
||||
case ARG_VERBOSE:
|
||||
verbose = 1;
|
||||
break;
|
||||
case ARG_FIRST:
|
||||
first_level = optarg;
|
||||
break;
|
||||
case ARG_SECOND:
|
||||
second_level = optarg;
|
||||
break;
|
||||
case ARG_KERNEL:
|
||||
kernel_image = optarg;
|
||||
break;
|
||||
case ARG_RAMDISK:
|
||||
ramdisk = optarg;
|
||||
break;
|
||||
case ARG_GETINFO:
|
||||
action_getinfo = 1;
|
||||
break;
|
||||
case ARG_CONFIG:
|
||||
config_path = optarg;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (optind < argc)
|
||||
image = argv[optind];
|
||||
|
||||
if (image == NULL)
|
||||
{
|
||||
fprintf(stderr,
|
||||
"ERROR: you must provide an image file or a block device.\n");
|
||||
usage(argc, argv);
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (action_getinfo)
|
||||
return get_info(image, verbose);
|
||||
|
||||
if (config_path != NULL)
|
||||
{
|
||||
emile_config* config;
|
||||
char *configuration;
|
||||
int timeout;
|
||||
@ -253,7 +194,8 @@ int main(int argc, char** argv)
|
||||
|
||||
if (kernel_image || ramdisk)
|
||||
{
|
||||
fprintf(stderr, "ERROR: don't use --kernel or --ramdisk with --config\n");
|
||||
fprintf(stderr,
|
||||
"ERROR: don't use --kernel or --ramdisk with --config\n");
|
||||
return 4;
|
||||
}
|
||||
config = emile_config_open(config_path);
|
||||
@ -326,12 +268,14 @@ int main(int argc, char** argv)
|
||||
else
|
||||
{
|
||||
if (kernel_ondisk == NULL)
|
||||
kernel_ondisk = emile_floppy_add(fd, kernel_image);
|
||||
kernel_ondisk = emile_floppy_add(fd,
|
||||
kernel_image);
|
||||
config_set_indexed_property(configuration,
|
||||
"title", title,
|
||||
"kernel", kernel_ondisk);
|
||||
if (verbose)
|
||||
printf(" kernel %s (%s)\n", kernel_image, kernel_ondisk);
|
||||
printf(" kernel %s (%s)\n",
|
||||
kernel_image, kernel_ondisk);
|
||||
}
|
||||
}
|
||||
if (!emile_config_get(config, CONFIG_INITRD, &ramdisk))
|
||||
@ -347,12 +291,14 @@ int main(int argc, char** argv)
|
||||
else
|
||||
{
|
||||
if (ramdisk_ondisk == NULL)
|
||||
ramdisk_ondisk = emile_floppy_add(fd, ramdisk);
|
||||
ramdisk_ondisk = emile_floppy_add(fd,
|
||||
ramdisk);
|
||||
config_set_indexed_property(configuration,
|
||||
"title", title,
|
||||
"initrd", ramdisk_ondisk);
|
||||
if (verbose)
|
||||
printf(" initrd %s (%s)\n", ramdisk, ramdisk_ondisk);
|
||||
printf(" initrd %s (%s)\n",
|
||||
ramdisk, ramdisk_ondisk);
|
||||
}
|
||||
}
|
||||
if (!emile_config_get(config, CONFIG_ARGS, &args))
|
||||
@ -374,7 +320,74 @@ int main(int argc, char** argv)
|
||||
free(configuration);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
int verbose = 0;
|
||||
int option_index = 0;
|
||||
char* first_level = NULL;
|
||||
char* second_level = NULL;
|
||||
char* kernel_image = NULL;
|
||||
char* ramdisk = NULL;
|
||||
char* image = NULL;
|
||||
char* config_path = NULL;
|
||||
int action_getinfo = 0;
|
||||
int c;
|
||||
int ret;
|
||||
|
||||
while(1)
|
||||
{
|
||||
c = getopt_long(argc, argv, "hvf:s:k:r:gc:", long_options,
|
||||
&option_index);
|
||||
if (c == -1)
|
||||
break;
|
||||
switch(c)
|
||||
{
|
||||
case ARG_HELP:
|
||||
usage(argc, argv);
|
||||
return 0;
|
||||
case ARG_VERBOSE:
|
||||
verbose = 1;
|
||||
break;
|
||||
case ARG_FIRST:
|
||||
first_level = optarg;
|
||||
break;
|
||||
case ARG_SECOND:
|
||||
second_level = optarg;
|
||||
break;
|
||||
case ARG_KERNEL:
|
||||
kernel_image = optarg;
|
||||
break;
|
||||
case ARG_RAMDISK:
|
||||
ramdisk = optarg;
|
||||
break;
|
||||
case ARG_GETINFO:
|
||||
action_getinfo = 1;
|
||||
break;
|
||||
case ARG_CONFIG:
|
||||
config_path = optarg;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (optind < argc)
|
||||
image = argv[optind];
|
||||
|
||||
if (image == NULL)
|
||||
{
|
||||
fprintf(stderr,
|
||||
"ERROR: you must provide an image file or a block device.\n");
|
||||
usage(argc, argv);
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (action_getinfo)
|
||||
return get_info(image, verbose);
|
||||
|
||||
if (config_path != NULL)
|
||||
return set_config(image, verbose, config_path,
|
||||
first_level, second_level);
|
||||
|
||||
if (first_level == NULL)
|
||||
first_level = PREFIX "/lib/emile/first_floppy";
|
||||
|
Loading…
x
Reference in New Issue
Block a user