From: Erik Andersen Date: Tue, 18 Apr 2000 23:32:10 +0000 (-0000) Subject: Fix creation of /linuxrc X-Git-Tag: 0_43~7 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9a8195cc03516b9f376b0f965d9f05fa326ac5d2;p=oweals%2Fbusybox.git Fix creation of /linuxrc -Erik --- diff --git a/TODO b/TODO index 4d1b82874..1edd9cdb0 100644 --- 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 73939c55f..f4260e937 100644 --- 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 100b26bad..65190f59d 100755 --- 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 73939c55f..f4260e937 100644 --- 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 79eef1d12..f1c7b4f13 100644 --- 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 100b26bad..65190f59d 100755 --- 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 90eec4e21..a49b8a0eb 100644 --- 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