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

Merge remote branch 'gears/sisyphus' into glibc

Browse Source 
Conflicts:
	propagator.spec
This commit is contained in:
Anton V. Boyarshinov 2010-12-02 13:29:53 +03:00
commit f9d1682589
5 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
init.c
View File

@ -47,6 +47,7 @@
char * env[] = {
"PATH=/usr/bin:/bin:/sbin:/usr/sbin",
"HOME=/",
"RUN_INITRD=1",
"TERM=linux",
"TERMINFO=/etc/terminfo",
NULL

8
propagator.spec
View File

@ -3,7 +3,7 @@
Name: propagator
Version: 20101130
Release: alt3
Release: alt4
Summary: 'Early userspace' set of binaries
License: GPL
@ -40,8 +40,12 @@ make %{?_with_shell:WITH_SHELL=t} %{?_with_splash:WITH_SPLASH=t} libdir=%_libdir
%_libdir/%name
%changelog
* Wed Dec 01 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 20101130-alt3
* Wed Dec 01 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 20101130-alt4
- telling plymouth about rootfs change added
- run udevd with --resolve-names=never
* Wed Dec 01 2010 Anton Farygin <rider@altlinux.ru> 20101130-alt3
- add nosplash command for disable plymouth
* Wed Dec 01 2010 Anton V. Boyarshinov <boyarsh@altlinux.ru> 20101130-alt2
- spawning plymouth fixed

4
stage1.c
View File

@ -154,6 +154,7 @@ static void spawn_shell(void)
static void spawn_splash(void)
{
#ifdef SPAWN_SPLASH
if (IS_NOPLYMOUTH) return;
char * splash_name[] = { "/sbin/plymouthd", "plymouthd", NULL };
log_message("spawning a splash screen");
@ -161,7 +162,8 @@ static void spawn_splash(void)
char * av[] = { "/bin/plymouth", "plymouth", "show-splash", NULL };
log_message( "%s: %s\n", av[0], av[2] );
return spawn(av);
spawn(av);
return;
#endif
}

2
stage1.h
View File

@ -42,6 +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 IS_TESTING (get_param(MODE_TESTING))
#define IS_EXPERT (get_param(MODE_EXPERT))
@ -54,6 +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))
void fatal_error(char *msg) __attribute__ ((noreturn));

9
tools.c
View File

@ -92,6 +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, "live")) set_param(MODE_LIVE);
if (!strcmp(name, "stagename")) set_param(MODE_STAGENAME);
if (!strcmp(name, "lowmem")) set_param(MODE_LOWMEM);
@ -315,16 +316,24 @@ enum return_type load_ramdisk_fd(int source_fd, int size)
int splash_verbose()
{
#ifdef SPAWN_SPLASH
if (IS_NOPLYMOUTH)
return(1);
char * av[] = { "/bin/plymouth" , "plymouth" , "hide-splash", NULL };
log_message( "%s: %s\n", av[0], av[2] );
return spawn(av);
#endif
}
int update_splash( char * state )
{
#ifdef SPAWN_SPLASH
if (IS_NOPLYMOUTH)
return(1);
char * av[] = { "/bin/plymouth" , "plymouth" , "--update" , state, NULL };
log_message( "%s: %s\n", av[0], av[3] );
return spawn(av);
#endif
}
char * get_ramdisk_realname(void)