aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-03-20 14:04:30 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-03-20 14:04:30 +0000
commitc52248e41ce50bd3fa684d19b2bce4320267dc44 (patch)
tree6c53a42b343804fc1a6ccbc6a3f00fa2e878f14f
parent3c96d0258c4f3321a8fef850587f55ff56032860 (diff)
downloadbusybox-w32-c52248e41ce50bd3fa684d19b2bce4320267dc44.tar.gz
busybox-w32-c52248e41ce50bd3fa684d19b2bce4320267dc44.tar.bz2
busybox-w32-c52248e41ce50bd3fa684d19b2bce4320267dc44.zip
small NOMMU fixes
-rw-r--r--TODO_config_nommu19
-rw-r--r--include/libbb.h2
-rw-r--r--miscutils/crond.c2
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#
6CONFIG_HAVE_DOT_CONFIG=y 6CONFIG_HAVE_DOT_CONFIG=y
7 7
@@ -393,6 +393,7 @@ CONFIG_ADDGROUP=y
393CONFIG_FEATURE_ADDUSER_TO_GROUP=y 393CONFIG_FEATURE_ADDUSER_TO_GROUP=y
394CONFIG_DELGROUP=y 394CONFIG_DELGROUP=y
395CONFIG_FEATURE_DEL_USER_FROM_GROUP=y 395CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
396CONFIG_FEATURE_CHECK_NAMES=y
396CONFIG_ADDUSER=y 397CONFIG_ADDUSER=y
397CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y 398CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y
398CONFIG_DELUSER=y 399CONFIG_DELUSER=y
@@ -631,15 +632,15 @@ CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
631CONFIG_FEATURE_IFCONFIG_HW=y 632CONFIG_FEATURE_IFCONFIG_HW=y
632CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y 633CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
633CONFIG_IFENSLAVE=y 634CONFIG_IFENSLAVE=y
634# CONFIG_IFUPDOWN is not set 635CONFIG_IFUPDOWN=y
635CONFIG_IFUPDOWN_IFSTATE_PATH="" 636CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
636# CONFIG_FEATURE_IFUPDOWN_IP is not set 637CONFIG_FEATURE_IFUPDOWN_IP=y
637# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set 638CONFIG_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 640CONFIG_FEATURE_IFUPDOWN_IPV4=y
640# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set 641CONFIG_FEATURE_IFUPDOWN_IPV6=y
641# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set 642CONFIG_FEATURE_IFUPDOWN_MAPPING=y
642# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set 643CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y
643CONFIG_INETD=y 644CONFIG_INETD=y
644CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y 645CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y
645CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y 646CONFIG_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) {