aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-05-08 15:11:02 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2017-05-08 15:11:02 +0200
commited820ccda1a2323b5821db637ccd6dbb3dfce340 (patch)
treee459ed1d67dd31648a74c37c258075327c770a02
parent741bfa9a7219e5d1a5540eddeb0953788549e1da (diff)
downloadbusybox-w32-ed820ccda1a2323b5821db637ccd6dbb3dfce340.tar.gz
busybox-w32-ed820ccda1a2323b5821db637ccd6dbb3dfce340.tar.bz2
busybox-w32-ed820ccda1a2323b5821db637ccd6dbb3dfce340.zip
udhcpc: do not accept --background on NOMMU (same as -b)
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--networking/udhcp/d6_dhcpc.c2
-rw-r--r--networking/udhcp/dhcpc.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c
index 9eddbe24c..18a104c61 100644
--- a/networking/udhcp/d6_dhcpc.c
+++ b/networking/udhcp/d6_dhcpc.c
@@ -54,7 +54,9 @@ static const char udhcpc6_longopts[] ALIGN1 =
54 "request-option\0" Required_argument "O" 54 "request-option\0" Required_argument "O"
55 "no-default-options\0" No_argument "o" 55 "no-default-options\0" No_argument "o"
56 "foreground\0" No_argument "f" 56 "foreground\0" No_argument "f"
57 USE_FOR_MMU(
57 "background\0" No_argument "b" 58 "background\0" No_argument "b"
59 )
58/// IF_FEATURE_UDHCPC_ARPING("arping\0" No_argument "a") 60/// IF_FEATURE_UDHCPC_ARPING("arping\0" No_argument "a")
59 IF_FEATURE_UDHCP_PORT("client-port\0" Required_argument "P") 61 IF_FEATURE_UDHCP_PORT("client-port\0" Required_argument "P")
60 ; 62 ;
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 1ccfff437..6aa6731fb 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -73,7 +73,9 @@ static const char udhcpc_longopts[] ALIGN1 =
73 "request-option\0" Required_argument "O" 73 "request-option\0" Required_argument "O"
74 "no-default-options\0" No_argument "o" 74 "no-default-options\0" No_argument "o"
75 "foreground\0" No_argument "f" 75 "foreground\0" No_argument "f"
76 USE_FOR_MMU(
76 "background\0" No_argument "b" 77 "background\0" No_argument "b"
78 )
77 "broadcast\0" No_argument "B" 79 "broadcast\0" No_argument "B"
78 IF_FEATURE_UDHCPC_ARPING("arping\0" Optional_argument "a") 80 IF_FEATURE_UDHCPC_ARPING("arping\0" Optional_argument "a")
79 IF_FEATURE_UDHCP_PORT("client-port\0" Required_argument "P") 81 IF_FEATURE_UDHCP_PORT("client-port\0" Required_argument "P")