- rel 3; enable more basic utilities for initrd version: chmod, chown, cp, df, ln...

[packages/busybox.git] / busybox-dhcp.patch

diff --git a/busybox-dhcp.patch b/busybox-dhcp.patch
index 9c588e4cee0f5b9baa23d7a296617e24cf8e231f..e812a6443733ac049f4d6177d2fde4ceb53359cf 100644 (file)
--- a/busybox-dhcp.patch
+++ b/busybox-dhcp.patch
@@ -1,14 +1,13 @@
---- busybox-1.3.1/networking/udhcp/options.c.orig      2006-12-27 05:52:33.000000000 +0100
-+++ busybox-1.3.1/networking/udhcp/options.c   2006-12-30 12:31:57.305539547 +0100
-@@ -24,8 +24,8 @@
-       { OPTION_STRING               | OPTION_REQ, 0x0c }, /* DHCP_HOST_NAME     */
+--- busybox-1.20.2/networking/udhcp/common.c~  2012-06-26 15:35:45.000000000 +0200
++++ busybox-1.20.2/networking/udhcp/common.c   2013-01-02 22:06:43.349795477 +0100
+@@ -32,8 +32,8 @@
+       { OPTION_STRING_HOST          | OPTION_REQ, 0x0c }, /* DHCP_HOST_NAME     */
        { OPTION_U16                              , 0x0d }, /* DHCP_BOOT_SIZE     */
-       { OPTION_STRING | OPTION_LIST | OPTION_REQ, 0x0f }, /* DHCP_DOMAIN_NAME   */
+       { OPTION_STRING_HOST          | OPTION_REQ, 0x0f }, /* DHCP_DOMAIN_NAME   */
 -      { OPTION_IP                               , 0x10 }, /* DHCP_SWAP_SERVER   */
 -      { OPTION_STRING                           , 0x11 }, /* DHCP_ROOT_PATH     */
-+      { OPTION_IP | OPTION_REQ                  , 0x10 }, /* DHCP_SWAP_SERVER   */
-+      { OPTION_STRING | OPTION_REQ              , 0x11 }, /* DHCP_ROOT_PATH     */
++      { OPTION_IP                   | OPTION_REQ, 0x10 }, /* DHCP_SWAP_SERVER   */
++      { OPTION_STRING               | OPTION_REQ, 0x11 }, /* DHCP_ROOT_PATH     */
        { OPTION_U8                               , 0x17 }, /* DHCP_IP_TTL        */
        { OPTION_U16                              , 0x1a }, /* DHCP_MTU           */
-       { OPTION_IP                   | OPTION_REQ, 0x1c }, /* DHCP_BROADCAST     */
-
+ //TODO: why do we request DHCP_BROADCAST? Can't we assume that