diff options
author | erik <erik@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2000-04-18 23:32:10 +0000 |
---|---|---|
committer | erik <erik@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2000-04-18 23:32:10 +0000 |
commit | 26b1780ed99710a134f4266c77aece6c82500a29 (patch) | |
tree | 3857674a2de28a112b221ef68f02b2bc7539537a | |
parent | 65cc2be726f9430710be310d278232efa26e0f3f (diff) | |
download | busybox-w32-26b1780ed99710a134f4266c77aece6c82500a29.tar.gz busybox-w32-26b1780ed99710a134f4266c77aece6c82500a29.tar.bz2 busybox-w32-26b1780ed99710a134f4266c77aece6c82500a29.zip |
Fix creation of /linuxrc
-Erik
git-svn-id: svn://busybox.net/trunk/busybox@480 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r-- | TODO | 2 | ||||
-rw-r--r-- | applets/busybox.c | 2 | ||||
-rwxr-xr-x | applets/install.sh | 1 | ||||
-rw-r--r-- | busybox.c | 2 | ||||
-rw-r--r-- | busybox.def.h | 8 | ||||
-rwxr-xr-x | install.sh | 1 | ||||
-rw-r--r-- | utility.c | 10 |
7 files changed, 19 insertions, 7 deletions
@@ -31,7 +31,7 @@ around to it some time. If you have any good ideas, please let me know. | |||
31 | ----------------------- | 31 | ----------------------- |
32 | 32 | ||
33 | Add a compile option to turn off all the compiled in help | 33 | Add a compile option to turn off all the compiled in help |
34 | andusage information. Some folks don't need or want it... | 34 | and usage information. Some folks don't need or want it... |
35 | 35 | ||
36 | ----------------------- | 36 | ----------------------- |
37 | 37 | ||
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[] = { | |||
149 | #ifdef BB_LENGTH | 149 | #ifdef BB_LENGTH |
150 | {"length", length_main, _BB_DIR_USR_BIN}, | 150 | {"length", length_main, _BB_DIR_USR_BIN}, |
151 | #endif | 151 | #endif |
152 | #ifdef BB_FEATURE_LINUXRC // | 152 | #ifdef BB_LINUXRC |
153 | {"linuxrc", init_main, _BB_DIR_ROOT}, | 153 | {"linuxrc", init_main, _BB_DIR_ROOT}, |
154 | #endif | 154 | #endif |
155 | #ifdef BB_LN | 155 | #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 | |||
15 | ln -fs /bin/busybox $1$i | 15 | ln -fs /bin/busybox $1$i |
16 | done | 16 | done |
17 | rm -f $1/bin/busybox | 17 | rm -f $1/bin/busybox |
18 | mkdir -p $1/bin | ||
18 | install -m 755 busybox $1/bin/busybox | 19 | install -m 755 busybox $1/bin/busybox |
19 | 20 | ||
20 | exit 0 | 21 | exit 0 |
@@ -149,7 +149,7 @@ static const struct Applet applets[] = { | |||
149 | #ifdef BB_LENGTH | 149 | #ifdef BB_LENGTH |
150 | {"length", length_main, _BB_DIR_USR_BIN}, | 150 | {"length", length_main, _BB_DIR_USR_BIN}, |
151 | #endif | 151 | #endif |
152 | #ifdef BB_FEATURE_LINUXRC // | 152 | #ifdef BB_LINUXRC |
153 | {"linuxrc", init_main, _BB_DIR_ROOT}, | 153 | {"linuxrc", init_main, _BB_DIR_ROOT}, |
154 | #endif | 154 | #endif |
155 | #ifdef BB_LN | 155 | #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 @@ | |||
211 | //--------------------------------------------------- | 211 | //--------------------------------------------------- |
212 | // Nothing beyond this point should ever be touched by | 212 | // Nothing beyond this point should ever be touched by |
213 | // mere mortals so leave this stuff alone. | 213 | // mere mortals so leave this stuff alone. |
214 | // | ||
214 | #ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT | 215 | #ifdef BB_FEATURE_MOUNT_MTAB_SUPPORT |
215 | #define BB_MTAB | 216 | #define BB_MTAB |
216 | #endif | 217 | #endif |
@@ -232,6 +233,13 @@ | |||
232 | #ifdef BB_FEATURE_LINUXRC | 233 | #ifdef BB_FEATURE_LINUXRC |
233 | #ifndef BB_INIT | 234 | #ifndef BB_INIT |
234 | #define BB_INIT | 235 | #define BB_INIT |
236 | #define BB_LINUXRC | ||
237 | #endif | ||
238 | #endif | ||
239 | // | ||
240 | #ifdef BB_GZIP | ||
241 | #ifndef BB_GUNZIP | ||
242 | #define BB_GUNZIP | ||
235 | #endif | 243 | #endif |
236 | #endif | 244 | #endif |
237 | // | 245 | // |
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 | |||
15 | ln -fs /bin/busybox $1$i | 15 | ln -fs /bin/busybox $1$i |
16 | done | 16 | done |
17 | rm -f $1/bin/busybox | 17 | rm -f $1/bin/busybox |
18 | mkdir -p $1/bin | ||
18 | install -m 755 busybox $1/bin/busybox | 19 | install -m 755 busybox $1/bin/busybox |
19 | 20 | ||
20 | exit 0 | 21 | exit 0 |
@@ -525,10 +525,12 @@ int fullRead(int fd, char *buf, int len) | |||
525 | 525 | ||
526 | 526 | ||
527 | #if defined (BB_CHMOD_CHOWN_CHGRP) \ | 527 | #if defined (BB_CHMOD_CHOWN_CHGRP) \ |
528 | || defined (BB_CP_MV) \ | 528 | || defined (BB_CP_MV) \ |
529 | || defined (BB_FIND) \ | 529 | || defined (BB_FIND) \ |
530 | || defined (BB_LS) \ | 530 | || defined (BB_INSMOD) \ |
531 | || defined (BB_INSMOD) | 531 | || defined (BB_RM) \ |
532 | || defined (BB_TAR) | ||
533 | |||
532 | /* | 534 | /* |
533 | * Walk down all the directories under the specified | 535 | * Walk down all the directories under the specified |
534 | * location, and do something (something specified | 536 | * location, and do something (something specified |