aboutsummaryrefslogtreecommitdiff
path: root/init/init.c
diff options
context:
space:
mode:
authorErik Andersen <andersen@codepoet.org>2000-03-04 21:19:32 +0000
committerErik Andersen <andersen@codepoet.org>2000-03-04 21:19:32 +0000
commit029011b9eeaf491d00fda1d072c4c6094df96c3a (patch)
tree7c49f1fc1547a2f9cee812472f422a5c1a5c448b /init/init.c
parent7c4b2f3fe5cb6b9a5c6bd089c18279c5ce29dc21 (diff)
downloadbusybox-w32-029011b9eeaf491d00fda1d072c4c6094df96c3a.tar.gz
busybox-w32-029011b9eeaf491d00fda1d072c4c6094df96c3a.tar.bz2
busybox-w32-029011b9eeaf491d00fda1d072c4c6094df96c3a.zip
A few updates (including the cp fix the Craig has been looking for)
-Erik
Diffstat (limited to 'init/init.c')
-rw-r--r--init/init.c11
1 files changed, 9 insertions, 2 deletions
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()
242 int fd; 242 int fd;
243 int tried_devcons = 0; 243 int tried_devcons = 0;
244 int tried_vtprimary = 0; 244 int tried_vtprimary = 0;
245 struct vt_stat vt;
245 struct serial_struct sr; 246 struct serial_struct sr;
246 char *s; 247 char *s;
247 248
@@ -264,8 +265,6 @@ static void console_init()
264 } 265 }
265#endif 266#endif
266 else { 267 else {
267 struct vt_stat vt;
268
269 /* 2.2 kernels: identify the real console backend and try to use it */ 268 /* 2.2 kernels: identify the real console backend and try to use it */
270 if (ioctl(0, TIOCGSERIAL, &sr) == 0) { 269 if (ioctl(0, TIOCGSERIAL, &sr) == 0) {
271 /* this is a serial console */ 270 /* this is a serial console */
@@ -951,3 +950,11 @@ extern int init_main(int argc, char **argv)
951 sleep(1); 950 sleep(1);
952 } 951 }
953} 952}
953
954/*
955Local Variables:
956c-file-style: "linux"
957c-basic-offset: 4
958tab-width: 4
959End:
960*/