Hi,
I am updating the linuxboot stuff, and the first one to update is the busy box.

I had modify the patch included. And it is using the default options on the config stuff.

Please apply.

Cheers

Index: Makefile
===================================================================
RCS file: /cvsroot/unattended/unattended/linuxboot/Makefile,v
retrieving revision 1.153
diff -r1.153 Makefile
2c2
< busybox=busybox-1.4.1
---
> busybox=busybox-1.6.1
Index: misc/busybox-patch
===================================================================
RCS file: /cvsroot/unattended/unattended/linuxboot/misc/busybox-patch,v
retrieving revision 1.6
diff -r1.6 busybox-patch
90,91c90,91
< --- busybox-1.4.1-orig/networking/udhcp/dhcpd.h       2007-01-24 
14:34:34.000000000 -0700
< +++ busybox-1.4.1/networking/udhcp/dhcpd.h    2007-03-12 14:43:26.000000000 
-0600
---
> --- busybox-1.4.1-orig/networking/udhcp/options.h     2007-01-24 
> 14:34:34.000000000 -0700
> +++ busybox-1.4.1/networking/udhcp/options.h  2007-03-12 14:43:26.000000000 
> -0600
100,102c100,101
< diff -u -r busybox-1.4.1-orig/networking/udhcp/options.c 
busybox-1.4.1/networking/udhcp/options.c
< --- busybox-1.4.1-orig/networking/udhcp/options.c     2007-01-24 
14:34:34.000000000 -0700
< +++ busybox-1.4.1/networking/udhcp/options.c  2007-03-12 14:37:54.000000000 
-0600
---
> --- busybox-1.6.1/networking/udhcp/options.c  2007-06-30 17:06:30.000000000 
> +0200
> +++ options.c.ori     2007-08-21 03:04:12.641055160 +0200
108c107
< +     {"wins",        OPTION_IP | OPTION_LIST | OPTION_REQ,   0x2c},
---
> +        {"wins",        OPTION_IP | OPTION_LIST | OPTION_REQ,   0x2c},
116,120c115,119
< +     /* Steal "local" option 0xe9 (decimal 233) for Unattended */
< +     {"unattend",    OPTION_STRING | OPTION_REQ,             0xe9},
<       /* MSIE's "Web Proxy Autodiscovery Protocol" support */
<       {"wpad",        OPTION_STRING,                          0xfc},
<       {"",            0x00,                                   0x00}
---
> +        /* Steal "local" option 0xe9 (decimal 233) for Unattended */
> +        {"unattend",    OPTION_STRING | OPTION_REQ,             0xe9},
>  #if ENABLE_FEATURE_RFC3397
>       {"search",      OPTION_STR1035 | OPTION_LIST | OPTION_REQ, 0x77},
>  #endif
Index: busybox-config
===================================================================
RCS file: /cvsroot/unattended/unattended/linuxboot/misc/busybox-config,v
retrieving revision 1.10
diff -r1.10 busybox-config
3,4c3,4
< # Busybox version: 1.4.1
< # Mon Mar 12 14:33:05 2007
---
> # Busybox version: 1.6.1
> # Tue Aug 21 03:07:16 2007
27a28
> # CONFIG_FEATURE_PIDFILE is not set
33a35
> # CONFIG_FEATURE_PREFER_APPLETS is not set
50,51c52,53
< # CONFIG_DEBUG_PESSIMIZE is not set
< # CONFIG_NO_DEBUG_LIB is not set
---
> # CONFIG_WERROR is not set
> CONFIG_NO_DEBUG_LIB=y
69a72,79
> # CONFIG_FEATURE_EDITING is not set
> # CONFIG_FEATURE_EDITING_FANCY_KEYS is not set
> # CONFIG_FEATURE_EDITING_VI is not set
> CONFIG_FEATURE_EDITING_HISTORY=
> # CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
> # CONFIG_FEATURE_TAB_COMPLETION is not set
> # CONFIG_FEATURE_USERNAME_COMPLETION is not set
> # CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set
187a198,199
> # CONFIG_SPLIT is not set
> # CONFIG_FEATURE_SPLIT_FANCY is not set
263a276
> # CONFIG_FEATURE_RUN_PARTS_FANCY is not set
302a316,324
> # CONFIG_FEATURE_FIND_USER is not set
> # CONFIG_FEATURE_FIND_GROUP is not set
> # CONFIG_FEATURE_FIND_NOT is not set
> # CONFIG_FEATURE_FIND_DEPTH is not set
> # CONFIG_FEATURE_FIND_PAREN is not set
> # CONFIG_FEATURE_FIND_SIZE is not set
> # CONFIG_FEATURE_FIND_PRUNE is not set
> # CONFIG_FEATURE_FIND_DELETE is not set
> # CONFIG_FEATURE_FIND_PATH is not set
319a342
> # CONFIG_FEATURE_INIT_SYSLOG is not set
332a356
> # CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
333a358
> # CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
343a369
> # CONFIG_CRYPTPW is not set
438a465
> # CONFIG_CHRT is not set
485a513
> # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
517d544
< # CONFIG_FEATURE_IFUPDOWN_IPX is not set
518a546
> # CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
545a574
> # CONFIG_FEATURE_NETSTAT_WIDE is not set
548d576
< CONFIG_FEATURE_FANCY_PING=y
550c578
< # CONFIG_FEATURE_FANCY_PING6 is not set
---
> CONFIG_FEATURE_FANCY_PING=y
571a600
> # CONFIG_FEATURE_RFC3397 is not set
576d604
< # CONFIG_FEATURE_WGET_IP6_LITERAL is not set
622a651,656
> # CONFIG_HUSH_HELP is not set
> # CONFIG_HUSH_INTERACTIVE is not set
> # CONFIG_HUSH_JOB is not set
> # CONFIG_HUSH_TICK is not set
> # CONFIG_HUSH_IF is not set
> # CONFIG_HUSH_LOOPS is not set
626,633c660,661
< # CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
< # CONFIG_FEATURE_COMMAND_EDITING is not set
< # CONFIG_FEATURE_COMMAND_EDITING_VI is not set
< CONFIG_FEATURE_COMMAND_HISTORY=
< # CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set
< # CONFIG_FEATURE_COMMAND_TAB_COMPLETION is not set
< # CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
< # CONFIG_FEATURE_SH_FANCY_PROMPT is not set
---
> # CONFIG_FEATURE_SH_STANDALONE is not set
> # CONFIG_CTTYHACK is not set
659a688,703
> # CONFIG_CHCON is not set
> # CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
> # CONFIG_GETENFORCE is not set
> # CONFIG_GETSEBOOL is not set
> # CONFIG_LOAD_POLICY is not set
> # CONFIG_MATCHPATHCON is not set
> # CONFIG_RUNCON is not set
> # CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
> # CONFIG_SELINUXENABLED is not set
> # CONFIG_SETENFORCE is not set
> 
> #
> # ipsvd utilities
> #
> # CONFIG_TCPSVD is not set
> # CONFIG_UDPSVD is not set
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
unattended-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/unattended-devel

Reply via email to