diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-20 14:04:30 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-20 14:04:30 +0000 |
commit | c52248e41ce50bd3fa684d19b2bce4320267dc44 (patch) | |
tree | 6c53a42b343804fc1a6ccbc6a3f00fa2e878f14f | |
parent | 3c96d0258c4f3321a8fef850587f55ff56032860 (diff) | |
download | busybox-w32-c52248e41ce50bd3fa684d19b2bce4320267dc44.tar.gz busybox-w32-c52248e41ce50bd3fa684d19b2bce4320267dc44.tar.bz2 busybox-w32-c52248e41ce50bd3fa684d19b2bce4320267dc44.zip |
small NOMMU fixes
-rw-r--r-- | TODO_config_nommu | 19 | ||||
-rw-r--r-- | include/libbb.h | 2 | ||||
-rw-r--r-- | miscutils/crond.c | 2 |
3 files changed, 12 insertions, 11 deletions
diff --git a/TODO_config_nommu b/TODO_config_nommu index 21960a0a4..42d17314a 100644 --- a/TODO_config_nommu +++ b/TODO_config_nommu | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Busybox version: 1.10.0.svn | 3 | # Busybox version: 1.10.0.svn |
4 | # Sat Mar 15 22:51:03 2008 | 4 | # Thu Mar 20 14:54:21 2008 |
5 | # | 5 | # |
6 | CONFIG_HAVE_DOT_CONFIG=y | 6 | CONFIG_HAVE_DOT_CONFIG=y |
7 | 7 | ||
@@ -393,6 +393,7 @@ CONFIG_ADDGROUP=y | |||
393 | CONFIG_FEATURE_ADDUSER_TO_GROUP=y | 393 | CONFIG_FEATURE_ADDUSER_TO_GROUP=y |
394 | CONFIG_DELGROUP=y | 394 | CONFIG_DELGROUP=y |
395 | CONFIG_FEATURE_DEL_USER_FROM_GROUP=y | 395 | CONFIG_FEATURE_DEL_USER_FROM_GROUP=y |
396 | CONFIG_FEATURE_CHECK_NAMES=y | ||
396 | CONFIG_ADDUSER=y | 397 | CONFIG_ADDUSER=y |
397 | CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y | 398 | CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y |
398 | CONFIG_DELUSER=y | 399 | CONFIG_DELUSER=y |
@@ -631,15 +632,15 @@ CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y | |||
631 | CONFIG_FEATURE_IFCONFIG_HW=y | 632 | CONFIG_FEATURE_IFCONFIG_HW=y |
632 | CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y | 633 | CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y |
633 | CONFIG_IFENSLAVE=y | 634 | CONFIG_IFENSLAVE=y |
634 | # CONFIG_IFUPDOWN is not set | 635 | CONFIG_IFUPDOWN=y |
635 | CONFIG_IFUPDOWN_IFSTATE_PATH="" | 636 | CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" |
636 | # CONFIG_FEATURE_IFUPDOWN_IP is not set | 637 | CONFIG_FEATURE_IFUPDOWN_IP=y |
637 | # CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set | 638 | CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y |
638 | # CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set | 639 | # CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set |
639 | # CONFIG_FEATURE_IFUPDOWN_IPV4 is not set | 640 | CONFIG_FEATURE_IFUPDOWN_IPV4=y |
640 | # CONFIG_FEATURE_IFUPDOWN_IPV6 is not set | 641 | CONFIG_FEATURE_IFUPDOWN_IPV6=y |
641 | # CONFIG_FEATURE_IFUPDOWN_MAPPING is not set | 642 | CONFIG_FEATURE_IFUPDOWN_MAPPING=y |
642 | # CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set | 643 | CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y |
643 | CONFIG_INETD=y | 644 | CONFIG_INETD=y |
644 | CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y | 645 | CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y |
645 | CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y | 646 | CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y |
diff --git a/include/libbb.h b/include/libbb.h index 19b3bba5f..9f208b390 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -732,7 +732,7 @@ enum { | |||
732 | # define bb_daemonize(flags) bb_daemonize_or_rexec(flags, bogus) | 732 | # define bb_daemonize(flags) bb_daemonize_or_rexec(flags, bogus) |
733 | #else | 733 | #else |
734 | void re_exec(char **argv) ATTRIBUTE_NORETURN; | 734 | void re_exec(char **argv) ATTRIBUTE_NORETURN; |
735 | void forkexit_or_rexec(char **argv) ATTRIBUTE_NORETURN; | 735 | void forkexit_or_rexec(char **argv); |
736 | extern bool re_execed; | 736 | extern bool re_execed; |
737 | int BUG_fork_is_unavailable_on_nommu(void); | 737 | int BUG_fork_is_unavailable_on_nommu(void); |
738 | int BUG_daemon_is_unavailable_on_nommu(void); | 738 | int BUG_daemon_is_unavailable_on_nommu(void); |
diff --git a/miscutils/crond.c b/miscutils/crond.c index fcfc120f0..ba9cf3581 100644 --- a/miscutils/crond.c +++ b/miscutils/crond.c | |||
@@ -175,7 +175,7 @@ int crond_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
175 | if (!(opt & OPT_f)) { | 175 | if (!(opt & OPT_f)) { |
176 | /* close stdin, stdout, stderr. | 176 | /* close stdin, stdout, stderr. |
177 | * close unused descriptors - don't need them. */ | 177 | * close unused descriptors - don't need them. */ |
178 | bb_daemonize_or_rexec(DAEMON_CLOSE_EXTRA_FDS, av); | 178 | bb_daemonize_or_rexec(DAEMON_CLOSE_EXTRA_FDS, argv); |
179 | } | 179 | } |
180 | 180 | ||
181 | if (!DebugOpt && LogFile == NULL) { | 181 | if (!DebugOpt && LogFile == NULL) { |