Fix creation of /linuxrc

 -Erik

diff --git a/TODO b/TODO
index 4d1b82874f7827ab1239634926f01da741723878..1edd9cdb0bddd92c6c1c83a7b88265473690726f 100644 (file)
--- a/TODO
+++ b/TODO
@@ -31,7 +31,7 @@ around to it some time. If you have any good ideas, please let me know.
 -----------------------
 
 Add a compile option to turn off all the compiled in help
-andusage information.  Some folks don't need or want it...
+and usage information.  Some folks don't need or want it...
 
 -----------------------
 

diff --git a/applets/busybox.c b/applets/busybox.c
index 73939c55f07641618fb807fa62182877876b465b..f4260e93730e93223f1bbcc24941fcf039ec9cf0 100644 (file)
--- a/applets/busybox.c
+++ b/applets/busybox.c
@@ -149,7 +149,7 @@ static const struct Applet applets[] = {
 #ifdef BB_LENGTH
        {"length", length_main, _BB_DIR_USR_BIN},
 #endif
-#ifdef BB_FEATURE_LINUXRC              //
+#ifdef BB_LINUXRC
        {"linuxrc", init_main, _BB_DIR_ROOT},
 #endif
 #ifdef BB_LN

diff --git a/applets/install.sh b/applets/install.sh
index 100b26bad28e48a8ac7d0eae807a3b045018b0b6..65190f59d85b10ed6f1bd18c4c63f13b1c5505c2 100755 (executable)
--- a/applets/install.sh
+++ b/applets/install.sh
@@ -15,6 +15,7 @@ for i in $h ; do
        ln -fs /bin/busybox $1$i
 done
 rm -f $1/bin/busybox
+mkdir -p $1/bin
 install -m 755 busybox $1/bin/busybox
 
 exit 0

diff --git a/busybox.c b/busybox.c
index 73939c55f07641618fb807fa62182877876b465b..f4260e93730e93223f1bbcc24941fcf039ec9cf0 100644 (file)
--- a/busybox.c
+++ b/busybox.c
@@ -149,7 +149,7 @@ static const struct Applet applets[] = {
 #ifdef BB_LENGTH
        {"length", length_main, _BB_DIR_USR_BIN},
 #endif
-#ifdef BB_FEATURE_LINUXRC              //
+#ifdef BB_LINUXRC
        {"linuxrc", init_main, _BB_DIR_ROOT},
 #endif
 #ifdef BB_LN

diff --git a/busybox.def.h b/busybox.def.h
index 79eef1d1219add81ddf11b7dff87b22ecc6a2ce5..f1c7b4f139abce5d9dee89dcf29241657d4137d5 100644 (file)
--- a/busybox.def.h
+++ b/busybox.def.h
@@ -211,6 +211,7 @@
 //---------------------------------------------------
 // Nothing beyond this point should ever be touched by 
 // mere mortals so leave this stuff alone.
+//
 #ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT
 #define BB_MTAB
 #endif
@@ -232,6 +233,13 @@
 #ifdef BB_FEATURE_LINUXRC
 #ifndef BB_INIT
 #define BB_INIT
+#define BB_LINUXRC
+#endif
+#endif
+//
+#ifdef BB_GZIP
+#ifndef BB_GUNZIP
+#define BB_GUNZIP
 #endif
 #endif
 //

diff --git a/install.sh b/install.sh
index 100b26bad28e48a8ac7d0eae807a3b045018b0b6..65190f59d85b10ed6f1bd18c4c63f13b1c5505c2 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -15,6 +15,7 @@ for i in $h ; do
        ln -fs /bin/busybox $1$i
 done
 rm -f $1/bin/busybox
+mkdir -p $1/bin
 install -m 755 busybox $1/bin/busybox
 
 exit 0

diff --git a/utility.c b/utility.c
index 90eec4e21be58e02ae565cfabff0a20fb6b7a0d9..a49b8a0eb63363b69bb6e228e026205fb94c4f3a 100644 (file)
--- a/utility.c
+++ b/utility.c
@@ -525,10 +525,12 @@ int fullRead(int fd, char *buf, int len)
 
 
 #if defined (BB_CHMOD_CHOWN_CHGRP) \
- || defined (BB_CP_MV)            \
- || defined (BB_FIND)             \
- || defined (BB_LS)               \
- || defined (BB_INSMOD)
+ || defined (BB_CP_MV)                 \
+ || defined (BB_FIND)                  \
+ || defined (BB_INSMOD)                        \
+ || defined (BB_RM)                            \
+ || defined (BB_TAR)
+
 /*
  * Walk down all the directories under the specified 
  * location, and do something (something specified