From f042f3c095e99887a076427cc04de54f90fe2c29 Mon Sep 17 00:00:00 2001 From: erik Date: Sat, 4 Mar 2000 21:19:32 +0000 Subject: A few updates (including the cp fix the Craig has been looking for) -Erik git-svn-id: svn://busybox.net/trunk/busybox@386 69ca8d6d-28ef-0310-b511-8ec308f3f277 --- init/init.c | 11 +++++++++-- init/reboot.c | 8 ++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) (limited to 'init') diff --git a/init/init.c b/init/init.c index 183739180..350ea62a8 100644 --- a/init/init.c +++ b/init/init.c @@ -242,6 +242,7 @@ static void console_init() int fd; int tried_devcons = 0; int tried_vtprimary = 0; + struct vt_stat vt; struct serial_struct sr; char *s; @@ -264,8 +265,6 @@ static void console_init() } #endif else { - struct vt_stat vt; - /* 2.2 kernels: identify the real console backend and try to use it */ if (ioctl(0, TIOCGSERIAL, &sr) == 0) { /* this is a serial console */ @@ -951,3 +950,11 @@ extern int init_main(int argc, char **argv) sleep(1); } } + +/* +Local Variables: +c-file-style: "linux" +c-basic-offset: 4 +tab-width: 4 +End: +*/ diff --git a/init/reboot.c b/init/reboot.c index ef2a848ee..f782fa1e6 100644 --- a/init/reboot.c +++ b/init/reboot.c @@ -29,3 +29,11 @@ extern int reboot_main(int argc, char **argv) /* don't assume init's pid == 1 */ exit(kill(findInitPid(), SIGINT)); } + +/* +Local Variables: +c-file-style: "linux" +c-basic-offset: 4 +tab-width: 4 +End: +*/ -- cgit v1.2.3-55-g6feb