diff --git a/stage1.c b/stage1.c index 1765547..27f85fb 100644 --- a/stage1.c +++ b/stage1.c @@ -154,7 +154,7 @@ static void spawn_shell(void) static void spawn_splash(void) { #ifdef SPAWN_SPLASH - if (IS_NOPLYMOUTH) return; + if (!IS_SPLASH) return; char * splash_name[] = { "/sbin/plymouthd", "plymouthd", NULL }; log_message("spawning a splash screen"); diff --git a/stage1.h b/stage1.h index 90c63cc..c9875db 100644 --- a/stage1.h +++ b/stage1.h @@ -42,7 +42,7 @@ extern char * interactive_fifo; #define MODE_RAMDISK (1 << 9) #define MODE_CHANGEDISK (1 << 10) #define MODE_UPDATEMODULES (1 << 11) -#define MODE_NOPLYMOUTH (1 << 12) +#define MODE_SPLASH (1 << 12) #define IS_TESTING (get_param(MODE_TESTING)) #define IS_EXPERT (get_param(MODE_EXPERT)) @@ -55,7 +55,7 @@ extern char * interactive_fifo; #define IS_RAMDISK (get_param(MODE_RAMDISK)) #define IS_CHANGEDISK (get_param(MODE_CHANGEDISK)) #define IS_UPDATEMODULES (get_param(MODE_UPDATEMODULES)) -#define IS_NOPLYMOUTH (get_param(MODE_NOPLYMOUTH)) +#define IS_SPLASH (get_param(MODE_SPLASH)) void fatal_error(char *msg) __attribute__ ((noreturn)); diff --git a/tools.c b/tools.c index d8cc4a5..ca6dbdb 100644 --- a/tools.c +++ b/tools.c @@ -92,7 +92,7 @@ void process_cmdline(void) if (!strcmp(name, "changedisk")) set_param(MODE_CHANGEDISK); if (!strcmp(name, "updatemodules")) set_param(MODE_UPDATEMODULES); if (!strcmp(name, "rescue")) set_param(MODE_RESCUE); - if (!strcmp(name, "nosplash")) set_param(MODE_NOPLYMOUTH); + if (!strcmp(name, "splash")) set_param(MODE_SPLASH); if (!strcmp(name, "live")) set_param(MODE_LIVE); if (!strcmp(name, "stagename")) set_param(MODE_STAGENAME); if (!strcmp(name, "lowmem")) set_param(MODE_LOWMEM); @@ -317,7 +317,7 @@ enum return_type load_ramdisk_fd(int source_fd, int size) int splash_verbose() { #ifdef SPAWN_SPLASH - if (IS_NOPLYMOUTH) + if (!IS_SPLASH) return(1); char * av[] = { "/bin/plymouth" , "plymouth" , "hide-splash", NULL }; log_message( "%s: %s\n", av[0], av[2] ); @@ -328,7 +328,7 @@ int splash_verbose() int update_splash( char * state ) { #ifdef SPAWN_SPLASH - if (IS_NOPLYMOUTH) + if (!IS_SPLASH) return(1); char * av[] = { "/bin/plymouth" , "plymouth" , "--update" , state, NULL }; log_message( "%s: %s\n", av[0], av[3] );