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

cleanup after merge

Browse Source
This commit is contained in:
Sergey Bolshakov 2008-03-13 19:21:16 +03:00
parent ba911cea3a
commit 8acfa120d5
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
init.c
View File

@ -54,20 +54,12 @@ char * env[] = {
char ** myenv = NULL; char ** myenv = NULL;
<<<<<<< HEAD:init.c
char *stage[] = {"/sbin/stage1", NULL};
=======
>>>>>>> e918341c2dd1189e2ef8991eba56480304bead8b:init.c
char *udevd[] = {"/sbin/udevd", NULL}; char *udevd[] = {"/sbin/udevd", NULL};
char *udevtrigger[] = {"/sbin/udevtrigger", NULL}; char *udevtrigger[] = {"/sbin/udevtrigger", NULL};
char *udevsettle[] = {"/sbin/udevsettle", NULL}; char *udevsettle[] = {"/sbin/udevsettle", NULL};
<<<<<<< HEAD:init.c
=======
extern void stage1(); extern void stage1();
>>>>>>> e918341c2dd1189e2ef8991eba56480304bead8b:init.c
/* /*
* this needs to handle the following cases: * this needs to handle the following cases:
* *
@ -340,10 +332,7 @@ int main(int argc, char **argv)
struct stat rst, cst, ist; struct stat rst, cst, ist;
struct statfs sfs; struct statfs sfs;
pid_t pid, klogpid, udevpid; pid_t pid, klogpid, udevpid;
<<<<<<< HEAD:init.c
sigset_t sig; sigset_t sig;
=======
>>>>>>> e918341c2dd1189e2ef8991eba56480304bead8b:init.c
int wait_status; int wait_status;
int fd = -1; int fd = -1;
int fds[2]; int fds[2];