summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorErik Andersen2000-03-04 21:19:32 +0000
committerErik Andersen2000-03-04 21:19:32 +0000
commit029011b9eeaf491d00fda1d072c4c6094df96c3a (patch)
tree7c49f1fc1547a2f9cee812472f422a5c1a5c448b /init
parent7c4b2f3fe5cb6b9a5c6bd089c18279c5ce29dc21 (diff)
downloadbusybox-029011b9eeaf491d00fda1d072c4c6094df96c3a.zip
busybox-029011b9eeaf491d00fda1d072c4c6094df96c3a.tar.gz
A few updates (including the cp fix the Craig has been looking for)
-Erik
Diffstat (limited to 'init')
-rw-r--r--init/init.c11
-rw-r--r--init/reboot.c8
2 files changed, 17 insertions, 2 deletions
diff --git a/init/init.c b/init/init.c
index 1837391..350ea62 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 ef2a848..f782fa1 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:
+*/