asheplyakov/propagator
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote branch 'rider/glibc'

Browse Source
This commit is contained in:
Sergey Bolshakov 2010-12-06 14:48:16 +03:00
commit c6eefeb08c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stage1.c
View File

@ -154,7 +154,7 @@ static void spawn_shell(void)
static void spawn_splash(void) static void spawn_splash(void)
{ {
#ifdef SPAWN_SPLASH #ifdef SPAWN_SPLASH
if (IS_NOPLYMOUTH) return; if (!IS_SPLASH) return;
char * splash_name[] = { "/sbin/plymouthd", "plymouthd", NULL }; char * splash_name[] = { "/sbin/plymouthd", "plymouthd", NULL };
log_message("spawning a splash screen"); log_message("spawning a splash screen");

4
stage1.h
View File

@ -42,7 +42,7 @@ extern char * interactive_fifo;
#define MODE_RAMDISK (1 << 9) #define MODE_RAMDISK (1 << 9)
#define MODE_CHANGEDISK (1 << 10) #define MODE_CHANGEDISK (1 << 10)
#define MODE_UPDATEMODULES (1 << 11) #define MODE_UPDATEMODULES (1 << 11)
#define MODE_NOPLYMOUTH (1 << 12) #define MODE_SPLASH (1 << 12)
#define IS_TESTING (get_param(MODE_TESTING)) #define IS_TESTING (get_param(MODE_TESTING))
#define IS_EXPERT (get_param(MODE_EXPERT)) #define IS_EXPERT (get_param(MODE_EXPERT))
@ -55,7 +55,7 @@ extern char * interactive_fifo;
#define IS_RAMDISK (get_param(MODE_RAMDISK)) #define IS_RAMDISK (get_param(MODE_RAMDISK))
#define IS_CHANGEDISK (get_param(MODE_CHANGEDISK)) #define IS_CHANGEDISK (get_param(MODE_CHANGEDISK))
#define IS_UPDATEMODULES (get_param(MODE_UPDATEMODULES)) #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)); void fatal_error(char *msg) __attribute__ ((noreturn));

6
tools.c
View File

@ -92,7 +92,7 @@ void process_cmdline(void)
if (!strcmp(name, "changedisk")) set_param(MODE_CHANGEDISK); if (!strcmp(name, "changedisk")) set_param(MODE_CHANGEDISK);
if (!strcmp(name, "updatemodules")) set_param(MODE_UPDATEMODULES); if (!strcmp(name, "updatemodules")) set_param(MODE_UPDATEMODULES);
if (!strcmp(name, "rescue")) set_param(MODE_RESCUE); 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, "live")) set_param(MODE_LIVE);
if (!strcmp(name, "stagename")) set_param(MODE_STAGENAME); if (!strcmp(name, "stagename")) set_param(MODE_STAGENAME);
if (!strcmp(name, "lowmem")) set_param(MODE_LOWMEM); 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() int splash_verbose()
{ {
#ifdef SPAWN_SPLASH #ifdef SPAWN_SPLASH
if (IS_NOPLYMOUTH) if (!IS_SPLASH)
return(1); return(1);
char * av[] = { "/bin/plymouth" , "plymouth" , "hide-splash", NULL }; char * av[] = { "/bin/plymouth" , "plymouth" , "hide-splash", NULL };
log_message( "%s: %s\n", av[0], av[2] ); log_message( "%s: %s\n", av[0], av[2] );
@ -328,7 +328,7 @@ int splash_verbose()
int update_splash( char * state ) int update_splash( char * state )
{ {
#ifdef SPAWN_SPLASH #ifdef SPAWN_SPLASH
if (IS_NOPLYMOUTH) if (!IS_SPLASH)
return(1); return(1);
char * av[] = { "/bin/plymouth" , "plymouth" , "--update" , state, NULL }; char * av[] = { "/bin/plymouth" , "plymouth" , "--update" , state, NULL };
log_message( "%s: %s\n", av[0], av[3] ); log_message( "%s: %s\n", av[0], av[3] );