From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Fri, 27 Nov 2009 01:35:15 +0000 (+0100)
Subject: ntpd: make it NOMMU-safe; ash: exclude it on NOMMU builds
X-Git-Tag: 1_16_0~190
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=160b9ca7318fb63e9432c1028f52373aea6166f9;p=oweals%2Fbusybox.git

ntpd: make it NOMMU-safe; ash: exclude it on NOMMU builds

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/networking/ntpd.c b/networking/ntpd.c
index 156cad6cf..c374120e2 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -892,6 +892,14 @@ static NOINLINE void ntp_init(char **argv)
 			&peers, &G.verbose);
 	if (!(opts & (OPT_p|OPT_l)))
 		bb_show_usage();
+	if (opts & OPT_g)
+		G.settime = 1;
+	while (peers)
+		add_peers(llist_pop(&peers));
+	if (!(opts & OPT_n)) {
+		bb_daemonize_or_rexec(DAEMON_DEVNULL_STDIO, argv);
+		logmode = LOGMODE_NONE;
+	}
 #if ENABLE_FEATURE_NTPD_SERVER
 	G.listen_fd = -1;
 	if (opts & OPT_l) {
@@ -900,14 +908,6 @@ static NOINLINE void ntp_init(char **argv)
 		setsockopt(G.listen_fd, IPPROTO_IP, IP_TOS, &const_IPTOS_LOWDELAY, sizeof(const_IPTOS_LOWDELAY));
 	}
 #endif
-	if (opts & OPT_g)
-		G.settime = 1;
-	while (peers)
-		add_peers(llist_pop(&peers));
-	if (!(opts & OPT_n)) {
-		logmode = LOGMODE_NONE;
-		bb_daemonize(DAEMON_DEVNULL_STDIO);
-	}
 	/* I hesitate to set -20 prio. -15 should be high enough for timekeeping */
 	if (opts & OPT_N)
 		setpriority(PRIO_PROCESS, 0, -15);
diff --git a/shell/Config.in b/shell/Config.in
index 998672cfc..8a2654071 100644
--- a/shell/Config.in
+++ b/shell/Config.in
@@ -15,6 +15,7 @@ choice
 config FEATURE_SH_IS_ASH
 	select ASH
 	bool "ash"
+	depends on !NOMMU
 
 config FEATURE_SH_IS_HUSH
 	select HUSH
@@ -36,6 +37,7 @@ endchoice
 config ASH
 	bool "ash"
 	default n
+	depends on !NOMMU
 	help
 	  Tha 'ash' shell adds about 60k in the default configuration and is
 	  the most complete and most pedantically correct shell included with