summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/automatic.c
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-12-20 18:51:31 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-12-20 18:51:31 +0000
commita47038859dc156d832fdae38fff319b6585a5694 (patch)
treee071847dee82923596891bf167cd3d5f00285146 /mdk-stage1/automatic.c
parent6f768666517680dbfe3bf9b128e6f9a038707140 (diff)
downloaddrakx-a47038859dc156d832fdae38fff319b6585a5694.tar
drakx-a47038859dc156d832fdae38fff319b6585a5694.tar.gz
drakx-a47038859dc156d832fdae38fff319b6585a5694.tar.bz2
drakx-a47038859dc156d832fdae38fff319b6585a5694.tar.xz
drakx-a47038859dc156d832fdae38fff319b6585a5694.zip
minimal bootsplash stage1 support
Diffstat (limited to 'mdk-stage1/automatic.c')
-rw-r--r--mdk-stage1/automatic.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/mdk-stage1/automatic.c b/mdk-stage1/automatic.c
index a2e32924e..3a816bab1 100644
--- a/mdk-stage1/automatic.c
+++ b/mdk-stage1/automatic.c
@@ -100,9 +100,10 @@ char * get_auto_value(char * auto_param)
enum return_type ask_from_list_auto(char *msg, char ** elems, char ** choice, char * auto_param, char ** elems_auto)
{
- if (!IS_AUTOMATIC)
+ if (!IS_AUTOMATIC) {
+ exit_bootsplash();
return ask_from_list(msg, elems, choice);
- else {
+ } else {
char ** sav_elems = elems;
char * tmp = get_auto_value(auto_param);
while (elems && *elems) {
@@ -121,9 +122,10 @@ enum return_type ask_from_list_auto(char *msg, char ** elems, char ** choice, ch
enum return_type ask_from_list_comments_auto(char *msg, char ** elems, char ** elems_comments, char ** choice, char * auto_param, char ** elems_auto)
{
- if (!IS_AUTOMATIC)
+ if (!IS_AUTOMATIC) {
+ exit_bootsplash();
return ask_from_list_comments(msg, elems, elems_comments, choice);
- else {
+ } else {
char ** sav_elems = elems;
char * tmp = get_auto_value(auto_param);
while (elems && *elems) {
@@ -143,9 +145,10 @@ enum return_type ask_from_list_comments_auto(char *msg, char ** elems, char ** e
enum return_type ask_from_entries_auto(char *msg, char ** questions, char *** answers, int entry_size, char ** questions_auto, void (*callback_func)(char ** strings))
{
- if (!IS_AUTOMATIC)
+ if (!IS_AUTOMATIC) {
+ exit_bootsplash();
return ask_from_entries(msg, questions, answers, entry_size, callback_func);
- else {
+ } else {
char * tmp_answers[50];
int i = 0;
while (questions && *questions) {