- rel 3; enable more basic utilities for initrd version: chmod, chown, cp, df, ln...

[packages/busybox.git] / busybox-logconsole.patch

diff --git a/busybox-logconsole.patch b/busybox-logconsole.patch
index e0ecee176d671f6cb0c1ed5b2ba408690702928b..f4acdd43a94d5905da99c8bd70c1ccf3bd2032c5 100644 (file)
--- a/busybox-logconsole.patch
+++ b/busybox-logconsole.patch
@@ -1,33 +1,31 @@
-diff -urN busybox-1.00-pre2/include/libbb.h busybox-1.00-pre2.org/include/libbb.h
---- busybox-1.00-pre2/include/libbb.h  2003-08-02 23:40:57.000000000 +0200
-+++ busybox-1.00-pre2.org/include/libbb.h      2003-08-02 23:45:09.000000000 +0200
-@@ -346,7 +346,7 @@
+--- busybox-1.17.3/include/libbb.h.orig        2010-10-09 22:57:13.000000000 +0300
++++ busybox-1.17.3/include/libbb.h     2010-11-08 21:21:38.520518694 +0200
+@@ -1677,7 +1677,7 @@
  # define VC_2 "/dev/vc/2"
  # define VC_3 "/dev/vc/3"
  # define VC_4 "/dev/vc/4"
 -# define VC_5 "/dev/vc/5"
 +# define VC_12 "/dev/vc/12"
- #if defined(__sh__) || defined(__H8300H__) || defined(__H8300S__)
- /* Yes, this sucks, but both SH (including sh64) and H8 have a SCI(F) for their
-    respective serial ports .. as such, we can't use the common device paths for
-@@ -367,7 +367,7 @@
+ # define VC_FORMAT "/dev/vc/%d"
+ # define LOOP_FORMAT "/dev/loop/%d"
+ # define LOOP_NAMESIZE (sizeof("/dev/loop/") + sizeof(int)*3 + 1)
+@@ -1690,7 +1690,7 @@
  # define VC_2 "/dev/tty2"
  # define VC_3 "/dev/tty3"
  # define VC_4 "/dev/tty4"
 -# define VC_5 "/dev/tty5"
 +# define VC_12 "/dev/tty12"
- #if defined(__sh__) || defined(__H8300H__) || defined(__H8300S__)
- #  define SC_0 "/dev/ttySC0"
- #  define SC_1 "/dev/ttySC1"
-diff -urN busybox-1.00-pre2/init/init.c busybox-1.00-pre2.org/init/init.c
---- busybox-1.00-pre2/init/init.c      2003-08-02 23:40:57.000000000 +0200
-+++ busybox-1.00-pre2.org/init/init.c  2003-08-02 23:45:30.000000000 +0200
-@@ -155,7 +155,7 @@
- static char console[CONSOLE_BUFF_SIZE] = _PATH_CONSOLE;
+ # define VC_FORMAT "/dev/tty%d"
+ # define LOOP_FORMAT "/dev/loop%d"
+ # define LOOP_NAMESIZE (sizeof("/dev/loop") + sizeof(int)*3 + 1)
+--- busybox/init/init.c.orig   2008-04-19 04:03:13.000000000 +0000
++++ busybox.o/init/init.c      2008-04-26 17:09:58.075653000 +0000
+@@ -64,7 +64,7 @@
+ /* Static variables */
+ static struct init_action *init_action_list = NULL;
  
- #if !ENABLE_SYSLOGD
--static char *log_console = VC_5;
-+static char *log_console = VC_12;
- #endif
- #if !ENABLE_DEBUG_INIT
- static sig_atomic_t got_cont = 0;
+-static const char *log_console = VC_5;
++static const char *log_console = VC_12;
+ 
+ enum {
+       L_LOG = 0x1,