diff -uprN -X dontdiff.uclinux-rootfs uclinux-rootfs.org/uClibc-0.9.28-20-xgot-ucontext/libc/inet/getaddrinfo.c uclinux-rootfs/uClibc-0.9.28-20-xgot-ucontext/libc/inet/getaddrinfo.c --- uclinux-rootfs.org/uClibc-0.9.28-20-xgot-ucontext/libc/inet/getaddrinfo.c 2007-02-09 06:20:56.000000000 +0900 +++ uclinux-rootfs/uClibc-0.9.28-20-xgot-ucontext/libc/inet/getaddrinfo.c 2008-05-28 13:26:49.000000000 +0900 @@ -316,14 +316,18 @@ gaih_inet_serv (const char *servicename, rc = gethostbyname2_r (name, _family, &th, tmpbuf, \ tmpbuflen, &h, &herrno); \ } while (rc == ERANGE && herrno == NETDB_INTERNAL); \ - if (rc != 0) \ + if (rc == TRY_AGAIN) \ + { \ + no_data = EAI_AGAIN; \ + } \ + else if (rc != 0) \ { \ if (herrno == NETDB_INTERNAL) \ { \ __set_h_errno (herrno); \ return -EAI_SYSTEM; \ } \ - if (herrno == TRY_AGAIN) \ + if (herrno == TRY_AGAIN) \ no_data = EAI_AGAIN; \ else \ no_data = herrno == NO_DATA; \ diff -uprN -X dontdiff.uclinux-rootfs uclinux-rootfs.org/uClibc-0.9.28-20-xgot-ucontext/libc/inet/resolv.c uclinux-rootfs/uClibc-0.9.28-20-xgot-ucontext/libc/inet/resolv.c --- uclinux-rootfs.org/uClibc-0.9.28-20-xgot-ucontext/libc/inet/resolv.c 2007-02-09 06:20:56.000000000 +0900 +++ uclinux-rootfs/uClibc-0.9.28-20-xgot-ucontext/libc/inet/resolv.c 2008-05-28 13:26:49.000000000 +0900 @@ -159,9 +159,9 @@ __UCLIBC_MUTEX_EXTERN(__resolv_lock); #define MAX_RECURSE 5 -#define REPLY_TIMEOUT 10 +#define REPLY_TIMEOUT 5 #define MAX_RETRIES 3 -#define MAX_SERVERS 3 +#define MAX_SERVERS 4 #define MAX_SEARCH 4 #define MAX_ALIASES 5 @@ -684,6 +684,9 @@ int __dns_lookup(const char *name, int t local_id = id; __UCLIBC_MUTEX_UNLOCK(mylock); +#if 1 + ++local_id; +#endif while (retries < MAX_RETRIES) { if (fd != -1) close(fd); @@ -692,7 +695,9 @@ int __dns_lookup(const char *name, int t memset(&h, 0, sizeof(h)); +#if 0 /* remove for secondary request want to use same id */ ++local_id; +#endif local_id &= 0xffff; h.id = local_id; dns = nsip[local_ns]; diff -uprN -X dontdiff.uclinux-rootfs uclinux-rootfs.org/uClibc-0.9.28-20-xgot-ucontext/libc/string/generic/memmove.c uclinux-rootfs/uClibc-0.9.28-20-xgot-ucontext/libc/string/generic/memmove.c --- uclinux-rootfs.org/uClibc-0.9.28-20-xgot-ucontext/libc/string/generic/memmove.c 2007-02-09 06:21:17.000000000 +0900 +++ uclinux-rootfs/uClibc-0.9.28-20-xgot-ucontext/libc/string/generic/memmove.c 2008-05-28 13:26:56.000000000 +0900 @@ -24,6 +24,8 @@ #include "memcopy.h" #include "pagecopy.h" +#define USE_MEMCPY 0 /* don't use memcpy for forward copies */ + static void _wordcopy_bwd_aligned (long int dstp, long int srcp, size_t len) { op_t a0, a1; @@ -206,6 +208,194 @@ static void _wordcopy_bwd_dest_aligned ( ((op_t *) dstp)[3] = MERGE (a0, sh_1, a1, sh_2); } +#if ! USE_MEMCPY +/* _wordcopy_fwd_aligned -- Copy block beginning at SRCP to + block beginning at DSTP with LEN `op_t' words (not LEN bytes!). + Both SRCP and DSTP should be aligned for memory operations on `op_t's. */ + +static void _wordcopy_fwd_aligned (long int dstp, long int srcp, size_t len) +{ + op_t a0, a1; + + switch (len % 8) + { + case 2: + a0 = ((op_t *) srcp)[0]; + srcp -= 6 * OPSIZ; + dstp -= 7 * OPSIZ; + len += 6; + goto do1; + case 3: + a1 = ((op_t *) srcp)[0]; + srcp -= 5 * OPSIZ; + dstp -= 6 * OPSIZ; + len += 5; + goto do2; + case 4: + a0 = ((op_t *) srcp)[0]; + srcp -= 4 * OPSIZ; + dstp -= 5 * OPSIZ; + len += 4; + goto do3; + case 5: + a1 = ((op_t *) srcp)[0]; + srcp -= 3 * OPSIZ; + dstp -= 4 * OPSIZ; + len += 3; + goto do4; + case 6: + a0 = ((op_t *) srcp)[0]; + srcp -= 2 * OPSIZ; + dstp -= 3 * OPSIZ; + len += 2; + goto do5; + case 7: + a1 = ((op_t *) srcp)[0]; + srcp -= 1 * OPSIZ; + dstp -= 2 * OPSIZ; + len += 1; + goto do6; + + case 0: + if (OP_T_THRES <= 3 * OPSIZ && len == 0) + return; + a0 = ((op_t *) srcp)[0]; + srcp -= 0 * OPSIZ; + dstp -= 1 * OPSIZ; + goto do7; + case 1: + a1 = ((op_t *) srcp)[0]; + srcp -=-1 * OPSIZ; + dstp -= 0 * OPSIZ; + len -= 1; + if (OP_T_THRES <= 3 * OPSIZ && len == 0) + goto do0; + goto do8; /* No-op. */ + } + + do + { + do8: + a0 = ((op_t *) srcp)[0]; + ((op_t *) dstp)[0] = a1; + do7: + a1 = ((op_t *) srcp)[1]; + ((op_t *) dstp)[1] = a0; + do6: + a0 = ((op_t *) srcp)[2]; + ((op_t *) dstp)[2] = a1; + do5: + a1 = ((op_t *) srcp)[3]; + ((op_t *) dstp)[3] = a0; + do4: + a0 = ((op_t *) srcp)[4]; + ((op_t *) dstp)[4] = a1; + do3: + a1 = ((op_t *) srcp)[5]; + ((op_t *) dstp)[5] = a0; + do2: + a0 = ((op_t *) srcp)[6]; + ((op_t *) dstp)[6] = a1; + do1: + a1 = ((op_t *) srcp)[7]; + ((op_t *) dstp)[7] = a0; + + srcp += 8 * OPSIZ; + dstp += 8 * OPSIZ; + len -= 8; + } + while (len != 0); + + /* This is the right position for do0. Please don't move + it into the loop. */ + do0: + ((op_t *) dstp)[0] = a1; +} + +/* _wordcopy_fwd_dest_aligned -- Copy block beginning at SRCP to + block beginning at DSTP with LEN `op_t' words (not LEN bytes!). + DSTP should be aligned for memory operations on `op_t's, but SRCP must + *not* be aligned. */ + +static void _wordcopy_fwd_dest_aligned (long int dstp, long int srcp, size_t len) +{ + op_t a0, a1, a2, a3; + int sh_1, sh_2; + + /* Calculate how to shift a word read at the memory operation + aligned srcp to make it aligned for copy. */ + + sh_1 = 8 * (srcp % OPSIZ); + sh_2 = 8 * OPSIZ - sh_1; + + /* Make SRCP aligned by rounding it down to the beginning of the `op_t' + it points in the middle of. */ + srcp &= -OPSIZ; + + switch (len % 4) + { + case 2: + a1 = ((op_t *) srcp)[0]; + a2 = ((op_t *) srcp)[1]; + srcp -= 1 * OPSIZ; + dstp -= 3 * OPSIZ; + len += 2; + goto do1; + case 3: + a0 = ((op_t *) srcp)[0]; + a1 = ((op_t *) srcp)[1]; + srcp -= 0 * OPSIZ; + dstp -= 2 * OPSIZ; + len += 1; + goto do2; + case 0: + if (OP_T_THRES <= 3 * OPSIZ && len == 0) + return; + a3 = ((op_t *) srcp)[0]; + a0 = ((op_t *) srcp)[1]; + srcp -=-1 * OPSIZ; + dstp -= 1 * OPSIZ; + len += 0; + goto do3; + case 1: + a2 = ((op_t *) srcp)[0]; + a3 = ((op_t *) srcp)[1]; + srcp -=-2 * OPSIZ; + dstp -= 0 * OPSIZ; + len -= 1; + if (OP_T_THRES <= 3 * OPSIZ && len == 0) + goto do0; + goto do4; /* No-op. */ + } + + do + { + do4: + a0 = ((op_t *) srcp)[0]; + ((op_t *) dstp)[0] = MERGE (a2, sh_1, a3, sh_2); + do3: + a1 = ((op_t *) srcp)[1]; + ((op_t *) dstp)[1] = MERGE (a3, sh_1, a0, sh_2); + do2: + a2 = ((op_t *) srcp)[2]; + ((op_t *) dstp)[2] = MERGE (a0, sh_1, a1, sh_2); + do1: + a3 = ((op_t *) srcp)[3]; + ((op_t *) dstp)[3] = MERGE (a1, sh_1, a2, sh_2); + + srcp += 4 * OPSIZ; + dstp += 4 * OPSIZ; + len -= 4; + } + while (len != 0); + + /* This is the right position for do0. Please don't move + it into the loop. */ + do0: + ((op_t *) dstp)[0] = MERGE (a2, sh_1, a3, sh_2); +} +#endif + void *memmove (void *dest, const void *src, size_t len) { unsigned long int dstp = (long int) dest; @@ -215,7 +405,7 @@ void *memmove (void *dest, const void *s Reduces the working set. */ if (dstp - srcp >= len) /* *Unsigned* compare! */ { -#if 1 +#if USE_MEMCPY #warning REMINDER: generic-opt memmove assumes memcpy does forward copying! memcpy(dest, src, len); #else diff -uprN -X dontdiff.uclinux-rootfs uclinux-rootfs.org/uClibc-0.9.28-20-xgot-ucontext/libpthread/linuxthreads/sysdeps/mips/pt-machine.h uclinux-rootfs/uClibc-0.9.28-20-xgot-ucontext/libpthread/linuxthreads/sysdeps/mips/pt-machine.h --- uclinux-rootfs.org/uClibc-0.9.28-20-xgot-ucontext/libpthread/linuxthreads/sysdeps/mips/pt-machine.h 2007-02-09 06:21:24.000000000 +0900 +++ uclinux-rootfs/uClibc-0.9.28-20-xgot-ucontext/libpthread/linuxthreads/sysdeps/mips/pt-machine.h 2008-07-29 14:20:37.000000000 +0900 @@ -78,7 +78,7 @@ register char * stack_pointer __asm__ (" /* Compare-and-swap for semaphores. */ - +#if 0 /* SHARP */ #define HAS_COMPARE_AND_SWAP PT_EI int __compare_and_swap (long int *p, long int oldval, long int newval) @@ -105,5 +105,6 @@ __compare_and_swap (long int *p, long in return ret; } +#endif /* 0 */ #endif /* pt-machine.h */ diff -uprN -X dontdiff.uclinux-rootfs uclinux-rootfs.org/user/busybox-1.2.1/init/init.c uclinux-rootfs/user/busybox-1.2.1/init/init.c --- uclinux-rootfs.org/user/busybox-1.2.1/init/init.c 2007-02-03 05:14:12.000000000 +0900 +++ uclinux-rootfs/user/busybox-1.2.1/init/init.c 2008-05-28 13:39:14.000000000 +0900 @@ -571,8 +571,10 @@ static pid_t run(const struct init_actio #endif /* Log the process name and args */ +#ifdef KERNEL_BOOT_LOG_ON message(LOG, "Starting pid %d, console %s: '%s'", getpid(), a->terminal, cmdpath); +#endif #if defined CONFIG_FEATURE_INIT_COREDUMPS { @@ -1059,7 +1061,9 @@ int init_main(int argc, char **argv) putenv((char *) *e); } /* Hello world */ +#ifdef KERNEL_BOOT_LOG_ON message(MAYBE_CONSOLE | LOG, "init started: %s", bb_msg_full_version); +#endif /* Make sure there is enough memory to do something useful. */ if (ENABLE_SWAPONOFF) { diff -uprN -X dontdiff.uclinux-rootfs uclinux-rootfs.org/user/busybox-1.2.1/networking/zcip.c uclinux-rootfs/user/busybox-1.2.1/networking/zcip.c --- uclinux-rootfs.org/user/busybox-1.2.1/networking/zcip.c 2007-02-03 05:14:05.000000000 +0900 +++ uclinux-rootfs/user/busybox-1.2.1/networking/zcip.c 2008-05-28 13:38:54.000000000 +0900 @@ -447,7 +447,10 @@ collision: conflicts++; if (conflicts >= MAX_CONFLICTS) { VDBG("%s ratelimit\n", intf); - sleep(RATE_LIMIT_INTERVAL); +// sleep(RATE_LIMIT_INTERVAL); + why = "10 times conflict"; + errno = EADDRINUSE; + goto bad; } // restart the whole protocol pick(&ip); diff -uprN -X dontdiff.uclinux-rootfs uclinux-rootfs.org/user/dhcp-0.10/Makefile uclinux-rootfs/user/dhcp-0.10/Makefile --- uclinux-rootfs.org/user/dhcp-0.10/Makefile 2007-02-03 05:13:58.000000000 +0900 +++ uclinux-rootfs/user/dhcp-0.10/Makefile 2008-06-30 09:22:53.000000000 +0900 @@ -26,10 +26,10 @@ etc=/etc sysconfigdir=/etc/sysconfig CHKCONFIG=/sbin/chkconfig -CFLAGS+= -Wall -DCONF_DH6OPT_DNS_RESOLVERS=25 \ - -DCONF_DH6OPT_DOMAIN_LIST=26 \ - -DCONF_DH6OPT_IA_PD=30 \ - -DCONF_DH6OPT_IAPREFIX=31 +CFLAGS+= -Wall -DCONF_DH6OPT_DNS_RESOLVERS=23 \ + -DCONF_DH6OPT_DOMAIN_LIST=24 \ + -DCONF_DH6OPT_IA_PD=25 \ + -DCONF_DH6OPT_IAPREFIX=26 COMMONGENSRCS=lease_token.c CLIENTGENSRCS=client6_parse.c client6_token.c dad_token.c ra_token.c \ diff -uprN -X dontdiff.uclinux-rootfs uclinux-rootfs.org/user/dhcp-0.10/common.c uclinux-rootfs/user/dhcp-0.10/common.c --- uclinux-rootfs.org/user/dhcp-0.10/common.c 2007-02-03 05:13:57.000000000 +0900 +++ uclinux-rootfs/user/dhcp-0.10/common.c 2008-06-30 09:22:53.000000000 +0900 @@ -740,6 +740,7 @@ get_duid(const char *idfile, const char "extracted an existing DUID from %s: %s", FNAME, idfile, duidstr(duid)); } else { +#ifdef DUID_TYPE1 /* Support DUID Type 1 */ u_int64_t t64; dp = (struct dhcp6_duid_type1 *)duid->duid_id; @@ -749,6 +750,11 @@ get_duid(const char *idfile, const char t64 = (u_int64_t)(time(NULL) - 946684800); dp->dh6duid1_time = htonl((u_long)(t64 & 0xffffffff)); memcpy((void *)(dp + 1), tmpbuf, (len - sizeof(*dp))); +#else /* Support DUID Type 3 */ + dp = (struct dhcp6_duid_type1 *)duid->duid_id; + dp->dh6duid1_type = htons(3); /* type 3 */ + dp->dh6duid1_hwtype = htons(hwtype); +#endif dprintf(LOG_DEBUG, "%s" "generated a new DUID: %s", FNAME, duidstr(duid)); diff -uprN -X dontdiff.uclinux-rootfs uclinux-rootfs.org/user/dhcp-0.10/dhcp6.h uclinux-rootfs/user/dhcp-0.10/dhcp6.h --- uclinux-rootfs.org/user/dhcp-0.10/dhcp6.h 2007-02-03 05:13:57.000000000 +0900 +++ uclinux-rootfs/user/dhcp-0.10/dhcp6.h 2008-06-30 09:22:53.000000000 +0900 @@ -103,7 +103,7 @@ #endif #define MAXDN 100 -#define RESOLV_CONF_FILE "/etc/resolv.conf" +#define RESOLV_CONF_FILE "/etc/resolv.conf.dhcp6c" #define RESOLV_CONF_BAK_FILE "/etc/resolv.conf.dhcpv6.bak" #define RESOLV_CONF_DHCPV6_FILE "/etc/resolv.conf.dhcpv6" char resolv_dhcpv6_file[254]; diff -uprN -X dontdiff.uclinux-rootfs uclinux-rootfs.org/user/dhcp-0.10/resolv_token.l uclinux-rootfs/user/dhcp-0.10/resolv_token.l --- uclinux-rootfs.org/user/dhcp-0.10/resolv_token.l 2007-02-03 05:13:58.000000000 +0900 +++ uclinux-rootfs/user/dhcp-0.10/resolv_token.l 2008-06-30 09:22:53.000000000 +0900 @@ -348,7 +348,7 @@ update_resolver(struct dns_list *dns_lis } } } - if (change_resolv_conf(resolv_dhcpv6_file)!=0) { + if (rename(resolv_dhcpv6_file, RESOLV_CONF_FILE)!=0) { dprintf(LOG_ERR, "%s" " rename failed for resolv.conf file", FNAME); return(-1); } diff -uprN -X dontdiff.uclinux-rootfs uclinux-rootfs.org/user/net-tools/config.h uclinux-rootfs/user/net-tools/config.h --- uclinux-rootfs.org/user/net-tools/config.h 2007-02-03 04:57:10.000000000 +0900 +++ uclinux-rootfs/user/net-tools/config.h 2008-05-28 13:38:02.000000000 +0900 @@ -28,7 +28,7 @@ */ #define HAVE_AFUNIX 1 #define HAVE_AFINET 1 -#define HAVE_AFINET6 0 +#define HAVE_AFINET6 1 #define HAVE_AFIPX 0 #define HAVE_AFATALK 0 #define HAVE_AFAX25 0 diff -uprN -X dontdiff.uclinux-rootfs uclinux-rootfs.org/vendors/Broadcom/97401c0/config.busybox uclinux-rootfs/vendors/Broadcom/97401c0/config.busybox --- uclinux-rootfs.org/vendors/Broadcom/97401c0/config.busybox 2007-02-06 05:46:44.000000000 +0900 +++ uclinux-rootfs/vendors/Broadcom/97401c0/config.busybox 2008-05-28 13:26:13.000000000 +0900 @@ -12,7 +12,7 @@ HAVE_DOT_CONFIG=y # # CONFIG_NITPICK is not set # CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set -CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set CONFIG_SHOW_USAGE=y CONFIG_FEATURE_VERBOSE_USAGE=y @@ -38,7 +38,6 @@ CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe CONFIG_LFS=y USING_CROSS_COMPILER=y CROSS_COMPILER_PREFIX="mipsel-linux-" -EXTRA_CFLAGS_OPTIONS="-I$(ROOTDIR)/uClibc/include -I$(ROOTDIR)/$(LINUXDIR)/include" # CONFIG_BUILD_AT_ONCE is not set # @@ -74,16 +73,16 @@ CONFIG_MD5_SIZE_VS_SPEED=2 # # CONFIG_AR is not set # CONFIG_FEATURE_AR_LONG_FILENAMES is not set -CONFIG_BUNZIP2=y +# CONFIG_BUNZIP2 is not set # CONFIG_CPIO is not set # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -CONFIG_GUNZIP=y +# CONFIG_GUNZIP is not set # CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set -CONFIG_GZIP=y +# CONFIG_GZIP is not set # CONFIG_RPM2CPIO is not set -CONFIG_RPM=y +# CONFIG_RPM is not set CONFIG_TAR=y CONFIG_FEATURE_TAR_CREATE=y CONFIG_FEATURE_TAR_BZIP2=y @@ -97,7 +96,7 @@ CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y # CONFIG_UNCOMPRESS is not set # CONFIG_UNLZMA is not set # CONFIG_FEATURE_LZMA_FAST is not set -CONFIG_UNZIP=y +# CONFIG_UNZIP is not set # # Common options for cpio and tar @@ -119,7 +118,7 @@ CONFIG_CHMOD=y CONFIG_CHOWN=y CONFIG_CHROOT=y # CONFIG_CKSUM is not set -CONFIG_CMP=y +# CONFIG_CMP is not set # CONFIG_COMM is not set CONFIG_CP=y CONFIG_CUT=y @@ -150,7 +149,7 @@ CONFIG_HEAD=y # CONFIG_FEATURE_FANCY_HEAD is not set # CONFIG_HOSTID is not set CONFIG_ID=y -CONFIG_INSTALL=y +# CONFIG_INSTALL is not set # CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set # CONFIG_LENGTH is not set CONFIG_LN=y @@ -164,18 +163,18 @@ CONFIG_FEATURE_LS_TIMESTAMPS=y CONFIG_FEATURE_LS_USERNAME=y CONFIG_FEATURE_LS_COLOR=y # CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set -CONFIG_MD5SUM=y +# CONFIG_MD5SUM is not set CONFIG_MKDIR=y # CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set # CONFIG_MKFIFO is not set CONFIG_MKNOD=y CONFIG_MV=y # CONFIG_FEATURE_MV_LONG_OPTIONS is not set -CONFIG_NICE=y +# CONFIG_NICE is not set # CONFIG_NOHUP is not set -CONFIG_OD=y -CONFIG_PRINTENV=y -CONFIG_PRINTF=y +# CONFIG_OD is not set +# CONFIG_PRINTENV is not set +# CONFIG_PRINTF is not set CONFIG_PWD=y # CONFIG_REALPATH is not set CONFIG_RM=y @@ -193,8 +192,8 @@ CONFIG_STTY=y CONFIG_SYNC=y CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y -CONFIG_TEE=y -CONFIG_FEATURE_TEE_USE_BLOCK_IO=y +# CONFIG_TEE is not set +# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set # CONFIG_TEST is not set # CONFIG_FEATURE_TEST_64 is not set CONFIG_TOUCH=y @@ -205,7 +204,7 @@ CONFIG_TRUE=y CONFIG_TTY=y CONFIG_UNAME=y CONFIG_UNIQ=y -CONFIG_USLEEP=y +# CONFIG_USLEEP is not set # CONFIG_UUDECODE is not set # CONFIG_UUENCODE is not set # CONFIG_WATCH is not set @@ -253,59 +252,59 @@ CONFIG_FEATURE_HUMAN_READABLE=y # # Debian Utilities # -CONFIG_MKTEMP=y +# CONFIG_MKTEMP is not set # CONFIG_PIPE_PROGRESS is not set -CONFIG_READLINK=y +# CONFIG_READLINK is not set # CONFIG_FEATURE_READLINK_FOLLOW is not set # CONFIG_RUN_PARTS is not set # CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set # CONFIG_START_STOP_DAEMON is not set # CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set # CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set -CONFIG_WHICH=y +# CONFIG_WHICH is not set # # Editors # -CONFIG_AWK=y +# CONFIG_AWK is not set # CONFIG_FEATURE_AWK_MATH is not set # CONFIG_ED is not set # CONFIG_PATCH is not set CONFIG_SED=y -CONFIG_VI=y -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -CONFIG_FEATURE_VI_USE_SIGNALS=y -CONFIG_FEATURE_VI_DOT_CMD=y -CONFIG_FEATURE_VI_READONLY=y -CONFIG_FEATURE_VI_SETOPTS=y -CONFIG_FEATURE_VI_SET=y -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y +# CONFIG_VI is not set +# CONFIG_FEATURE_VI_COLON is not set +# CONFIG_FEATURE_VI_YANKMARK is not set +# CONFIG_FEATURE_VI_SEARCH is not set +# CONFIG_FEATURE_VI_USE_SIGNALS is not set +# CONFIG_FEATURE_VI_DOT_CMD is not set +# CONFIG_FEATURE_VI_READONLY is not set +# CONFIG_FEATURE_VI_SETOPTS is not set +# CONFIG_FEATURE_VI_SET is not set +# CONFIG_FEATURE_VI_WIN_RESIZE is not set +# CONFIG_FEATURE_VI_OPTIMIZE_CURSOR is not set # # Finding Utilities # -CONFIG_FIND=y -CONFIG_FEATURE_FIND_PRINT0=y -CONFIG_FEATURE_FIND_MTIME=y -CONFIG_FEATURE_FIND_MMIN=y -CONFIG_FEATURE_FIND_PERM=y -CONFIG_FEATURE_FIND_TYPE=y -CONFIG_FEATURE_FIND_XDEV=y +# CONFIG_FIND is not set +# CONFIG_FEATURE_FIND_PRINT0 is not set +# CONFIG_FEATURE_FIND_MTIME is not set +# CONFIG_FEATURE_FIND_MMIN is not set +# CONFIG_FEATURE_FIND_PERM is not set +# CONFIG_FEATURE_FIND_TYPE is not set +# CONFIG_FEATURE_FIND_XDEV is not set # CONFIG_FEATURE_FIND_NEWER is not set # CONFIG_FEATURE_FIND_INUM is not set -CONFIG_FEATURE_FIND_EXEC=y +# CONFIG_FEATURE_FIND_EXEC is not set CONFIG_GREP=y CONFIG_FEATURE_GREP_EGREP_ALIAS=y CONFIG_FEATURE_GREP_FGREP_ALIAS=y CONFIG_FEATURE_GREP_CONTEXT=y -CONFIG_XARGS=y +# CONFIG_XARGS is not set # CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set -CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y -CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y -CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y +# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set +# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set +# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set # # Init Utilities @@ -316,7 +315,7 @@ CONFIG_FEATURE_USE_INITTAB=y # CONFIG_FEATURE_INIT_SCTTY is not set CONFIG_FEATURE_EXTRA_QUIET=y # CONFIG_FEATURE_INIT_COREDUMPS is not set -CONFIG_FEATURE_INITRD=y +# CONFIG_FEATURE_INITRD is not set CONFIG_HALT=y # CONFIG_MESG is not set @@ -334,7 +333,7 @@ CONFIG_HALT=y # CONFIG_FEATURE_UTMP is not set # CONFIG_FEATURE_WTMP is not set CONFIG_LOGIN=y -CONFIG_FEATURE_SECURETTY=y +# CONFIG_FEATURE_SECURETTY is not set # CONFIG_PASSWD is not set # CONFIG_SU is not set # CONFIG_SULOGIN is not set @@ -384,20 +383,20 @@ CONFIG_DMESG=y # CONFIG_FEATURE_FBSET_READMODE is not set # CONFIG_FDFLUSH is not set # CONFIG_FDFORMAT is not set -CONFIG_FDISK=y -FDISK_SUPPORT_LARGE_DISKS=y -CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FDISK is not set +# FDISK_SUPPORT_LARGE_DISKS is not set +# CONFIG_FEATURE_FDISK_WRITABLE is not set # CONFIG_FEATURE_AIX_LABEL is not set # CONFIG_FEATURE_SGI_LABEL is not set # CONFIG_FEATURE_SUN_LABEL is not set # CONFIG_FEATURE_OSF_LABEL is not set -CONFIG_FEATURE_FDISK_ADVANCED=y +# CONFIG_FEATURE_FDISK_ADVANCED is not set # CONFIG_FREERAMDISK is not set # CONFIG_FSCK_MINIX is not set # CONFIG_MKFS_MINIX is not set # CONFIG_FEATURE_MINIX2 is not set # CONFIG_GETOPT is not set -CONFIG_HEXDUMP=y +# CONFIG_HEXDUMP is not set # CONFIG_HWCLOCK is not set # CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set @@ -407,17 +406,17 @@ CONFIG_HEXDUMP=y # CONFIG_MDEV is not set # CONFIG_FEATURE_MDEV_CONF is not set # CONFIG_FEATURE_MDEV_EXEC is not set -CONFIG_MKSWAP=y +# CONFIG_MKSWAP is not set # CONFIG_FEATURE_MKSWAP_V0 is not set CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y +# CONFIG_FEATURE_USE_TERMIOS is not set CONFIG_MOUNT=y -CONFIG_FEATURE_MOUNT_NFS=y -CONFIG_PIVOT_ROOT=y -CONFIG_RDATE=y +# CONFIG_FEATURE_MOUNT_NFS is not set +# CONFIG_PIVOT_ROOT is not set +# CONFIG_RDATE is not set # CONFIG_READPROFILE is not set # CONFIG_SETARCH is not set -CONFIG_SWAPONOFF=y +# CONFIG_SWAPONOFF is not set # CONFIG_SWITCH_ROOT is not set CONFIG_UMOUNT=y CONFIG_FEATURE_UMOUNT_ALL=y @@ -465,24 +464,24 @@ CONFIG_FEATURE_MOUNT_LOOP=y # CONFIG_MT is not set # CONFIG_RUNLEVEL is not set # CONFIG_RX is not set -CONFIG_STRINGS=y +# CONFIG_STRINGS is not set # CONFIG_SETSID is not set # CONFIG_TASKSET is not set -CONFIG_TIME=y +# CONFIG_TIME is not set # CONFIG_WATCHDOG is not set # # Networking Utilities # -# CONFIG_FEATURE_IPV6 is not set +CONFIG_FEATURE_IPV6=y # CONFIG_ARPING is not set # CONFIG_DNSD is not set # CONFIG_ETHER_WAKE is not set # CONFIG_FAKEIDENTD is not set -CONFIG_FTPGET=y -CONFIG_FTPPUT=y +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set -CONFIG_HOSTNAME=y +# CONFIG_HOSTNAME is not set # CONFIG_HTTPD is not set # CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set # CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set @@ -514,8 +513,8 @@ CONFIG_HOSTNAME=y # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set # CONFIG_FEATURE_INETD_RPC is not set -# CONFIG_IP is not set -# CONFIG_FEATURE_IP_ADDRESS is not set +CONFIG_IP=y +CONFIG_FEATURE_IP_ADDRESS=y # CONFIG_FEATURE_IP_LINK is not set # CONFIG_FEATURE_IP_ROUTE is not set # CONFIG_FEATURE_IP_TUNNEL is not set @@ -532,15 +531,15 @@ CONFIG_HOSTNAME=y # CONFIG_NC_GAPING_SECURITY_HOLE is not set # CONFIG_NETSTAT is not set # CONFIG_NSLOOKUP is not set -CONFIG_PING=y -CONFIG_FEATURE_FANCY_PING=y +# CONFIG_PING is not set +# CONFIG_FEATURE_FANCY_PING is not set # CONFIG_PING6 is not set # CONFIG_FEATURE_FANCY_PING6 is not set # CONFIG_ROUTE is not set -CONFIG_TELNET=y -CONFIG_FEATURE_TELNET_TTYPE=y -CONFIG_FEATURE_TELNET_AUTOLOGIN=y -CONFIG_TELNETD=y +# CONFIG_TELNET is not set +# CONFIG_FEATURE_TELNET_TTYPE is not set +# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set +# CONFIG_TELNETD is not set # CONFIG_FEATURE_TELNETD_INETD is not set CONFIG_TFTP=y CONFIG_FEATURE_TFTP_GET=y @@ -556,17 +555,17 @@ CONFIG_FEATURE_TFTP_BLOCKSIZE=y # udhcp Server/Client # # CONFIG_APP_UDHCPD is not set -# CONFIG_APP_UDHCPC is not set +CONFIG_APP_UDHCPC=y # CONFIG_APP_DUMPLEASES is not set # CONFIG_FEATURE_UDHCP_SYSLOG is not set # CONFIG_FEATURE_UDHCP_DEBUG is not set # CONFIG_VCONFIG is not set -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y +# CONFIG_WGET is not set +# CONFIG_FEATURE_WGET_STATUSBAR is not set +# CONFIG_FEATURE_WGET_AUTHENTICATION is not set # CONFIG_FEATURE_WGET_IP6_LITERAL is not set # CONFIG_FEATURE_WGET_LONG_OPTIONS is not set -# CONFIG_ZCIP is not set +CONFIG_ZCIP=y # # Process Utilities @@ -582,8 +581,8 @@ CONFIG_PS=y # CONFIG_FEATURE_PS_WIDE is not set CONFIG_RENICE=y # CONFIG_BB_SYSCTL is not set -# CONFIG_TOP is not set -# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y # CONFIG_UPTIME is not set # @@ -616,7 +615,7 @@ CONFIG_FEATURE_SH_IS_NONE=y # 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=0 +# CONFIG_FEATURE_COMMAND_HISTORY is not set # CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set # CONFIG_FEATURE_COMMAND_TAB_COMPLETION is not set # CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set @@ -625,12 +624,12 @@ CONFIG_FEATURE_COMMAND_HISTORY=0 # # System Logging Utilities # -CONFIG_SYSLOGD=y -CONFIG_FEATURE_ROTATE_LOGFILE=y +# CONFIG_SYSLOGD is not set +# CONFIG_FEATURE_ROTATE_LOGFILE is not set # CONFIG_FEATURE_REMOTE_LOG is not set # CONFIG_FEATURE_IPC_SYSLOG is not set -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 +# CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE is not set # CONFIG_LOGREAD is not set # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set -CONFIG_KLOGD=y -CONFIG_LOGGER=y +# CONFIG_KLOGD is not set +# CONFIG_LOGGER is not set diff -uprN -X dontdiff.uclinux-rootfs uclinux-rootfs.org/vendors/Broadcom/97401c0/config.vendor-2.6.x uclinux-rootfs/vendors/Broadcom/97401c0/config.vendor-2.6.x --- uclinux-rootfs.org/vendors/Broadcom/97401c0/config.vendor-2.6.x 2007-02-03 05:14:39.000000000 +0900 +++ uclinux-rootfs/vendors/Broadcom/97401c0/config.vendor-2.6.x 2008-05-28 13:26:13.000000000 +0900 @@ -1,5 +1,5 @@ # -# Automatically generated make config: don't edit +# Automatically generated by make menuconfig: don't edit # # @@ -52,22 +52,22 @@ CONFIG_LIB_LIBTERMCAP=y # Force build (Normally built when required) # # CONFIG_LIB_DIRECTFB_FORCE is not set -CONFIG_LIB_FREETYPE_FORCE=y +# CONFIG_LIB_FREETYPE_FORCE is not set # CONFIG_LIB_LIBDES_FORCE is not set # CONFIG_LIB_LIBSSL_FORCE is not set # CONFIG_LIB_LIBGMP_FORCE is not set # CONFIG_LIB_LIBG_FORCE is not set # CONFIG_LIB_LIBPAM_FORCE is not set # CONFIG_LIB_LIBPCAP_FORCE is not set -CONFIG_LIB_ZLIB_FORCE=y +# CONFIG_LIB_ZLIB_FORCE is not set # CONFIG_LIB_LIBATM_FORCE is not set -CONFIG_LIB_LIBPNG_FORCE=y -CONFIG_LIB_LIBJPEG_FORCE=y +# CONFIG_LIB_LIBPNG_FORCE is not set +# CONFIG_LIB_LIBJPEG_FORCE is not set # CONFIG_LIB_NCURSES_FORCE is not set -CONFIG_LIB_FREETYPE=y -CONFIG_LIB_LIBJPEG=y -CONFIG_LIB_LIBPNG=y -CONFIG_LIB_ZLIB=y +# CONFIG_LIB_FREETYPE is not set +# CONFIG_LIB_LIBJPEG is not set +# CONFIG_LIB_LIBPNG is not set +# CONFIG_LIB_ZLIB is not set # # Library Configuration @@ -86,9 +86,9 @@ CONFIG_LIB_ZLIB=y # # MTD utils # -CONFIG_USER_MTDUTILS=y -CONFIG_USER_MTDUTILS_ERASE=y -CONFIG_USER_MTDUTILS_ERASEALL=y +# CONFIG_USER_MTDUTILS is not set +# CONFIG_USER_MTDUTILS_ERASE is not set +# CONFIG_USER_MTDUTILS_ERASEALL is not set # CONFIG_USER_MTDUTILS_FTL_CHECK is not set # CONFIG_USER_MTDUTILS_FTL_FORMAT is not set # CONFIG_USER_MTDUTILS_MKFSJFFS is not set @@ -99,7 +99,6 @@ CONFIG_USER_MTDUTILS_ERASEALL=y # CONFIG_USER_MTDUTILS_NANDTEST is not set # CONFIG_USER_MTDUTILS_NANDWRITE is not set # CONFIG_USER_MTDUTILS_DOC_LOADBIOS is not set -CONFIG_LIB_ZLIB=y # # Filesystem Applications @@ -107,22 +106,22 @@ CONFIG_LIB_ZLIB=y # CONFIG_USER_FLATFSD_FLATFSD is not set # CONFIG_USER_MOUNT_MOUNT is not set # CONFIG_USER_MOUNT_UMOUNT is not set -CONFIG_USER_FDISK_FDISK=y -CONFIG_USER_HDPARM_HDPARM=y +# CONFIG_USER_FDISK_FDISK is not set +# CONFIG_USER_HDPARM_HDPARM is not set # # EXT2 # -CONFIG_USER_E2FSPROGS_E2FSCK_E2FSCK=y -CONFIG_USER_E2FSPROGS_MISC_MKE2FS=y -CONFIG_USER_E2FSPROGS_MISC_BADBLOCKS=y +# CONFIG_USER_E2FSPROGS_E2FSCK_E2FSCK is not set +# CONFIG_USER_E2FSPROGS_MISC_MKE2FS is not set +# CONFIG_USER_E2FSPROGS_MISC_BADBLOCKS is not set # CONFIG_USER_E2FSPROGS_MISC_CHATTR is not set # CONFIG_USER_E2FSPROGS_MISC_DUMPE2FS is not set # CONFIG_USER_E2FSPROGS_MISC_E2LABEL is not set -CONFIG_USER_E2FSPROGS_MISC_FSCK=y +# CONFIG_USER_E2FSPROGS_MISC_FSCK is not set # CONFIG_USER_E2FSPROGS_MISC_LSATTR is not set -CONFIG_USER_E2FSPROGS_MISC_MKLOST_FOUND=y -CONFIG_USER_E2FSPROGS_MISC_TUNE2FS=y +# CONFIG_USER_E2FSPROGS_MISC_MKLOST_FOUND is not set +# CONFIG_USER_E2FSPROGS_MISC_TUNE2FS is not set # CONFIG_USER_E2FSPROGS_MISC_UUIDGEN is not set # @@ -166,18 +165,16 @@ CONFIG_LIB_ZLIB=y # # Network Applications # -CONFIG_USER_ROUTE_ARP=y +# CONFIG_USER_ROUTE_ARP is not set # CONFIG_USER_BOA_SRC_BOA is not set # CONFIG_USER_BPALOGIN_BPALOGIN is not set # CONFIG_USER_BR2684CTL_BR2684CTL is not set # CONFIG_USER_BRCFG_BRCFG is not set # CONFIG_USER_DHCPCD_DHCPCD is not set -CONFIG_USER_DHCPCD_NEW_DHCPCD=y +# CONFIG_USER_DHCPCD_NEW_DHCPCD is not set # CONFIG_USER_DHCPD_DHCPD is not set # CONFIG_USER_DHCP_ISC_SERVER_DHCPD is not set # CONFIG_USER_DHCP_ISC_CLIENT_DHCP is not set -# CONFIG_USER_DHCPCV6_DHCPCV6 is not set -# CONFIG_USER_DHCPSV6_DHCPSV6 is not set # CONFIG_USER_DIALD_DIALD is not set # CONFIG_USER_DISCARD_DISCARD is not set # CONFIG_USER_DNSMASQ_DNSMASQ is not set @@ -189,7 +186,7 @@ CONFIG_USER_DHCPCD_NEW_DHCPCD=y # CONFIG_USER_HTTPD_HTTPD is not set # CONFIG_USER_IDB_IDB is not set # CONFIG_USER_IFATTACH_IFATTACH is not set -CONFIG_USER_ROUTE_IFCONFIG=y +# CONFIG_USER_ROUTE_IFCONFIG is not set # CONFIG_USER_INETD_INETD is not set # CONFIG_USER_IPCHAINS_IPCHAINS is not set # CONFIG_USER_IPERF is not set @@ -198,7 +195,7 @@ CONFIG_USER_ROUTE_IFCONFIG=y # CONFIG_USER_IPPORTFW_IPPORTFW is not set # CONFIG_USER_IPREDIR_IPREDIR is not set # CONFIG_USER_IPROUTE2 is not set -# CONFIG_USER_IPTABLES_IPTABLES is not set +CONFIG_USER_IPTABLES_IPTABLES=y # CONFIG_USER_KLAXON_KLAXON is not set # CONFIG_USER_L2TPD_L2TPD is not set # CONFIG_USER_LOATTACH_LOATTACH is not set @@ -211,14 +208,14 @@ CONFIG_USER_ROUTE_IFCONFIG=y # CONFIG_USER_ROUTE_MIITOOL is not set # CONFIG_USER_PING_PING is not set # CONFIG_USER_PLUG_PLUG is not set -CONFIG_USER_PORTMAP_PORTMAP=y +# CONFIG_USER_PORTMAP_PORTMAP is not set # CONFIG_USER_PPPD_PPPD_PPPD is not set # CONFIG_USER_PPTPD_PPTPCTRL is not set # CONFIG_USER_PPTPD_PPTPD is not set # CONFIG_USER_PPTP_CLIENT_PPTP is not set # CONFIG_USER_PPTP_CLIENT_PPTP_CALLMGR is not set # CONFIG_USER_RDATE_RDATE is not set -CONFIG_USER_ROUTE_ROUTE=y +# CONFIG_USER_ROUTE_ROUTE is not set # CONFIG_USER_ROUTED_ROUTED is not set # CONFIG_USER_RP_PPPOE_PPPOE is not set # CONFIG_USER_SETHDLC_SETHDLC is not set @@ -240,7 +237,7 @@ CONFIG_USER_ROUTE_ROUTE=y # CONFIG_USER_THTTPD_THTTPD is not set # CONFIG_USER_TRACEROUTE_TRACEROUTE is not set # CONFIG_USER_UCDSNMP_SNMPD is not set -CONFIG_USER_UTELNETD=y +# CONFIG_USER_UTELNETD is not set # CONFIG_USER_VPNLED_VPNLED is not set # CONFIG_USER_WGET is not set # CONFIG_USER_ZEBRA_ZEBRA_ZEBRA is not set @@ -248,14 +245,14 @@ CONFIG_USER_UTELNETD=y # # Net-tools # -# CONFIG_USER_NET_TOOLS_ARP is not set -# CONFIG_USER_NET_TOOLS_HOSTNAME is not set -# CONFIG_USER_NET_TOOLS_IFCONFIG is not set -# CONFIG_USER_NET_TOOLS_NAMEIF is not set -# CONFIG_USER_NET_TOOLS_NETSTAT is not set -# CONFIG_USER_NET_TOOLS_PLIPCONFIG is not set -# CONFIG_USER_NET_TOOLS_RARP is not set -# CONFIG_USER_NET_TOOLS_ROUTE is not set +CONFIG_USER_NET_TOOLS_ARP=y +CONFIG_USER_NET_TOOLS_HOSTNAME=y +CONFIG_USER_NET_TOOLS_IFCONFIG=y +CONFIG_USER_NET_TOOLS_NAMEIF=y +CONFIG_USER_NET_TOOLS_NETSTAT=y +CONFIG_USER_NET_TOOLS_PLIPCONFIG=y +CONFIG_USER_NET_TOOLS_RARP=y +CONFIG_USER_NET_TOOLS_ROUTE=y # CONFIG_USER_NET_TOOLS_SLATTACH is not set # CONFIG_USER_NET_TOOLS_MII_TOOL is not set @@ -282,7 +279,7 @@ CONFIG_USER_UTELNETD=y # CONFIG_USER_DHRYSTONE_DHRYSTONE is not set # CONFIG_USER_FROB_LED_FROB_LED is not set # CONFIG_USER_GDBSERVER_GDBREPLAY is not set -CONFIG_USER_GDBSERVER_GDBSERVER=y +# CONFIG_USER_GDBSERVER_GDBSERVER is not set # CONFIG_USER_HD_HD is not set # CONFIG_USER_LCD_LCD is not set # CONFIG_USER_LEDCON_LEDCON is not set @@ -299,11 +296,11 @@ CONFIG_USER_GDBSERVER_GDBSERVER=y # CONFIG_USER_ROOTLOADER_ROOTLOADER is not set # CONFIG_USER_SETSERIAL_SETSERIAL is not set # CONFIG_USER_TRIPWIRE_SIGGEN is not set -CONFIG_USER_STRACE_STRACE=y +# CONFIG_USER_STRACE_STRACE is not set # CONFIG_USER_STTY_STTY is not set # CONFIG_USER_TCSH_TCSH is not set # CONFIG_USER_THREADDEMOS_THREADDEMOS is not set -CONFIG_USER_TIP_TIP=y +# CONFIG_USER_TIP_TIP is not set # CONFIG_USER_TRIPWIRE_TRIPWIRE is not set # @@ -408,7 +405,7 @@ CONFIG_USER_SYSUTILS_PS=y # CONFIG_USER_PROCPS_TLOAD is not set CONFIG_USER_PROCPS_TOP=y # CONFIG_USER_PROCPS_UPTIME is not set -CONFIG_USER_PROCPS_VMSTAT=y +# CONFIG_USER_PROCPS_VMSTAT is not set # CONFIG_USER_PROCPS_W is not set # CONFIG_USER_PROCPS_WATCH is not set CONFIG_LIB_NCURSES=y @@ -477,12 +474,5 @@ CONFIG_USER_RAMIMAGE_NONE=y # # CONFIG_LIB_DEBUG is not set # CONFIG_USER_DEBUG is not set -# CONFIG_USER_PROFILE_OPROFILE is not set -# CONFIG_USER_PROFILE_POFT is not set - -# -# Debug tools -# # CONFIG_USER_TIMEPEG_TPT is not set -# CONFIG_USER_LTT_TRACEDAEMON is not set - +# CONFIG_USER_PROFILE_OPROFILE is not set diff -uprN -X dontdiff.uclinux-rootfs uclinux-rootfs.org/vendors/Broadcom/97402c0/Makefile uclinux-rootfs/vendors/Broadcom/97402c0/Makefile --- uclinux-rootfs.org/vendors/Broadcom/97402c0/Makefile 2007-02-03 05:14:39.000000000 +0900 +++ uclinux-rootfs/vendors/Broadcom/97402c0/Makefile 2008-05-28 13:26:14.000000000 +0900 @@ -47,7 +47,7 @@ ROMFSDIR ?= $(ROOTDIR)/romfs DIRS = -ROMFS_DIRS = bin dev etc etc/dhcpc lib lib/modules home mnt mnt/hd mnt/nfs proc root usr var +ROMFS_DIRS = bin dev etc etc/dhcpc lib lib/modules home mnt mnt/hd mnt/nfs mnt/upd proc root usr var ifdef CONFIG_BLK_DEV_INITRD ROMFS_DIRS += sbin tmp var/run var/log var/tmp /var/lock dev/pts usr/sbin @@ -86,7 +86,7 @@ DEVICES = \ tty0,c,4,0 tty1,c,4,1 tty2,c,4,2 \ tty3,c,4,3 tty4,c,4,4 tty5,c,4,5 \ ttyS0,c,4,64 ttyS1,c,4,65 \ - ttyS64,c,4,128 \ + ttyS64,c,4,128 \ \ sda,b,8,0 sda1,b,8,1 sda2,b,8,2 \ sda3,b,8,3 sda4,b,8,4 sda5,b,8,5 \ @@ -106,8 +106,16 @@ DEVICES = \ mtd4,c,90,8 mtdr4,c,90,9 mtdblock4,b,31,4 \ mtd5,c,90,10 mtdr5,c,90,11 mtdblock5,b,31,5 \ mtd6,c,90,12 mtdr6,c,90,13 mtdblock6,b,31,6 \ + mtd7,c,90,14 mtdr7,c,90,15 mtdblock7,b,31,7 \ + mtd8,c,90,16 mtdr8,c,90,17 mtdblock8,b,31,8 \ + mtd9,c,90,18 mtdr9,c,90,19 mtdblock9,b,31,9 \ + mtd10,c,90,20 mtdr10,c,90,21 mtdblock10,b,31,10 \ + mtd11,c,90,22 mtdr10,c,90,23 mtdblock10,b,31,11 \ + mtd12,c,90,24 mtdr10,c,90,25 mtdblock10,b,31,12 \ + mtd13,c,90,26 mtdr10,c,90,27 mtdblock10,b,31,13 \ + mtd14,c,90,28 mtdr10,c,90,29 mtdblock10,b,31,14 \ \ - loop0,b,7,0 loop1,b,7,1 loop2,b,7,2 \ + loop0,b,7,0 loop1,b,7,1 loop2,b,7,2 \ loop3,b,7,3 loop4,b,7,4 loop5,b,7,5 \ loop6,b,7,6 loop7,b,7,7 loop8,b,7,8 \ loop9,b,7,9 loop10,b,7,10 loop11,b,7,11 \ diff -uprN -X dontdiff.uclinux-rootfs uclinux-rootfs.org/vendors/Broadcom/97402c0/config.arch uclinux-rootfs/vendors/Broadcom/97402c0/config.arch --- uclinux-rootfs.org/vendors/Broadcom/97402c0/config.arch 2007-02-03 05:14:39.000000000 +0900 +++ uclinux-rootfs/vendors/Broadcom/97402c0/config.arch 2008-05-28 13:26:14.000000000 +0900 @@ -4,7 +4,7 @@ # Vendor specific settings # -CONSOLE_BAUD_RATE = 115200 +CONSOLE_BAUD_RATE = 38400 LINUXTARGET = vmlinux ############################################################################ diff -uprN -X dontdiff.uclinux-rootfs uclinux-rootfs.org/vendors/Broadcom/97402c0/config.busybox uclinux-rootfs/vendors/Broadcom/97402c0/config.busybox --- uclinux-rootfs.org/vendors/Broadcom/97402c0/config.busybox 2007-02-06 05:46:44.000000000 +0900 +++ uclinux-rootfs/vendors/Broadcom/97402c0/config.busybox 2008-05-28 13:45:51.000000000 +0900 @@ -12,7 +12,7 @@ HAVE_DOT_CONFIG=y # # CONFIG_NITPICK is not set # CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set -CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set CONFIG_SHOW_USAGE=y CONFIG_FEATURE_VERBOSE_USAGE=y @@ -74,16 +74,16 @@ CONFIG_MD5_SIZE_VS_SPEED=2 # # CONFIG_AR is not set # CONFIG_FEATURE_AR_LONG_FILENAMES is not set -CONFIG_BUNZIP2=y +# CONFIG_BUNZIP2 is not set # CONFIG_CPIO is not set # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -CONFIG_GUNZIP=y +# CONFIG_GUNZIP is not set # CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set -CONFIG_GZIP=y +# CONFIG_GZIP is not set # CONFIG_RPM2CPIO is not set -CONFIG_RPM=y +# CONFIG_RPM is not set CONFIG_TAR=y CONFIG_FEATURE_TAR_CREATE=y CONFIG_FEATURE_TAR_BZIP2=y @@ -97,7 +97,7 @@ CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y # CONFIG_UNCOMPRESS is not set # CONFIG_UNLZMA is not set # CONFIG_FEATURE_LZMA_FAST is not set -CONFIG_UNZIP=y +# CONFIG_UNZIP is not set # # Common options for cpio and tar @@ -119,7 +119,7 @@ CONFIG_CHMOD=y CONFIG_CHOWN=y CONFIG_CHROOT=y # CONFIG_CKSUM is not set -CONFIG_CMP=y +# CONFIG_CMP is not set # CONFIG_COMM is not set CONFIG_CP=y CONFIG_CUT=y @@ -150,7 +150,7 @@ CONFIG_HEAD=y # CONFIG_FEATURE_FANCY_HEAD is not set # CONFIG_HOSTID is not set CONFIG_ID=y -CONFIG_INSTALL=y +# CONFIG_INSTALL is not set # CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set # CONFIG_LENGTH is not set CONFIG_LN=y @@ -164,18 +164,18 @@ CONFIG_FEATURE_LS_TIMESTAMPS=y CONFIG_FEATURE_LS_USERNAME=y CONFIG_FEATURE_LS_COLOR=y # CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set -CONFIG_MD5SUM=y +# CONFIG_MD5SUM is not set CONFIG_MKDIR=y # CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set # CONFIG_MKFIFO is not set CONFIG_MKNOD=y CONFIG_MV=y # CONFIG_FEATURE_MV_LONG_OPTIONS is not set -CONFIG_NICE=y +# CONFIG_NICE is not set # CONFIG_NOHUP is not set -CONFIG_OD=y -CONFIG_PRINTENV=y -CONFIG_PRINTF=y +# CONFIG_OD is not set +# CONFIG_PRINTENV is not set +# CONFIG_PRINTF is not set CONFIG_PWD=y # CONFIG_REALPATH is not set CONFIG_RM=y @@ -193,8 +193,8 @@ CONFIG_STTY=y CONFIG_SYNC=y CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y -CONFIG_TEE=y -CONFIG_FEATURE_TEE_USE_BLOCK_IO=y +# CONFIG_TEE is not set +# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set # CONFIG_TEST is not set # CONFIG_FEATURE_TEST_64 is not set CONFIG_TOUCH=y @@ -205,7 +205,7 @@ CONFIG_TRUE=y CONFIG_TTY=y CONFIG_UNAME=y CONFIG_UNIQ=y -CONFIG_USLEEP=y +# CONFIG_USLEEP is not set # CONFIG_UUDECODE is not set # CONFIG_UUENCODE is not set # CONFIG_WATCH is not set @@ -253,59 +253,59 @@ CONFIG_FEATURE_HUMAN_READABLE=y # # Debian Utilities # -CONFIG_MKTEMP=y +# CONFIG_MKTEMP is not set # CONFIG_PIPE_PROGRESS is not set -CONFIG_READLINK=y +# CONFIG_READLINK is not set # CONFIG_FEATURE_READLINK_FOLLOW is not set # CONFIG_RUN_PARTS is not set # CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set # CONFIG_START_STOP_DAEMON is not set # CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set # CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set -CONFIG_WHICH=y +# CONFIG_WHICH is not set # # Editors # -CONFIG_AWK=y +# CONFIG_AWK is not set # CONFIG_FEATURE_AWK_MATH is not set # CONFIG_ED is not set # CONFIG_PATCH is not set CONFIG_SED=y -CONFIG_VI=y -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -CONFIG_FEATURE_VI_USE_SIGNALS=y -CONFIG_FEATURE_VI_DOT_CMD=y -CONFIG_FEATURE_VI_READONLY=y -CONFIG_FEATURE_VI_SETOPTS=y -CONFIG_FEATURE_VI_SET=y -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y +# CONFIG_VI is not set +# CONFIG_FEATURE_VI_COLON is not set +# CONFIG_FEATURE_VI_YANKMARK is not set +# CONFIG_FEATURE_VI_SEARCH is not set +# CONFIG_FEATURE_VI_USE_SIGNALS is not set +# CONFIG_FEATURE_VI_DOT_CMD is not set +# CONFIG_FEATURE_VI_READONLY is not set +# CONFIG_FEATURE_VI_SETOPTS is not set +# CONFIG_FEATURE_VI_SET is not set +# CONFIG_FEATURE_VI_WIN_RESIZE is not set +# CONFIG_FEATURE_VI_OPTIMIZE_CURSOR is not set # # Finding Utilities # -CONFIG_FIND=y -CONFIG_FEATURE_FIND_PRINT0=y -CONFIG_FEATURE_FIND_MTIME=y -CONFIG_FEATURE_FIND_MMIN=y -CONFIG_FEATURE_FIND_PERM=y -CONFIG_FEATURE_FIND_TYPE=y -CONFIG_FEATURE_FIND_XDEV=y +# CONFIG_FIND is not set +# CONFIG_FEATURE_FIND_PRINT0 is not set +# CONFIG_FEATURE_FIND_MTIME is not set +# CONFIG_FEATURE_FIND_MMIN is not set +# CONFIG_FEATURE_FIND_PERM is not set +# CONFIG_FEATURE_FIND_TYPE is not set +# CONFIG_FEATURE_FIND_XDEV is not set # CONFIG_FEATURE_FIND_NEWER is not set # CONFIG_FEATURE_FIND_INUM is not set -CONFIG_FEATURE_FIND_EXEC=y +# CONFIG_FEATURE_FIND_EXEC is not set CONFIG_GREP=y CONFIG_FEATURE_GREP_EGREP_ALIAS=y CONFIG_FEATURE_GREP_FGREP_ALIAS=y CONFIG_FEATURE_GREP_CONTEXT=y -CONFIG_XARGS=y +# CONFIG_XARGS is not set # CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set -CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y -CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y -CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y +# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set +# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set +# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set # # Init Utilities @@ -316,7 +316,7 @@ CONFIG_FEATURE_USE_INITTAB=y # CONFIG_FEATURE_INIT_SCTTY is not set CONFIG_FEATURE_EXTRA_QUIET=y # CONFIG_FEATURE_INIT_COREDUMPS is not set -CONFIG_FEATURE_INITRD=y +# CONFIG_FEATURE_INITRD is not set CONFIG_HALT=y # CONFIG_MESG is not set @@ -334,7 +334,7 @@ CONFIG_HALT=y # CONFIG_FEATURE_UTMP is not set # CONFIG_FEATURE_WTMP is not set CONFIG_LOGIN=y -CONFIG_FEATURE_SECURETTY=y +# CONFIG_FEATURE_SECURETTY is not set # CONFIG_PASSWD is not set # CONFIG_SU is not set # CONFIG_SULOGIN is not set @@ -384,20 +384,20 @@ CONFIG_DMESG=y # CONFIG_FEATURE_FBSET_READMODE is not set # CONFIG_FDFLUSH is not set # CONFIG_FDFORMAT is not set -CONFIG_FDISK=y -FDISK_SUPPORT_LARGE_DISKS=y -CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FDISK is not set +# FDISK_SUPPORT_LARGE_DISKS is not set +# CONFIG_FEATURE_FDISK_WRITABLE is not set # CONFIG_FEATURE_AIX_LABEL is not set # CONFIG_FEATURE_SGI_LABEL is not set # CONFIG_FEATURE_SUN_LABEL is not set # CONFIG_FEATURE_OSF_LABEL is not set -CONFIG_FEATURE_FDISK_ADVANCED=y +# CONFIG_FEATURE_FDISK_ADVANCED is not set # CONFIG_FREERAMDISK is not set # CONFIG_FSCK_MINIX is not set # CONFIG_MKFS_MINIX is not set # CONFIG_FEATURE_MINIX2 is not set # CONFIG_GETOPT is not set -CONFIG_HEXDUMP=y +# CONFIG_HEXDUMP is not set # CONFIG_HWCLOCK is not set # CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set @@ -407,17 +407,17 @@ CONFIG_HEXDUMP=y # CONFIG_MDEV is not set # CONFIG_FEATURE_MDEV_CONF is not set # CONFIG_FEATURE_MDEV_EXEC is not set -CONFIG_MKSWAP=y +# CONFIG_MKSWAP is not set # CONFIG_FEATURE_MKSWAP_V0 is not set CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y +# CONFIG_FEATURE_USE_TERMIOS is not set CONFIG_MOUNT=y -CONFIG_FEATURE_MOUNT_NFS=y -CONFIG_PIVOT_ROOT=y -CONFIG_RDATE=y +# CONFIG_FEATURE_MOUNT_NFS is not set +# CONFIG_PIVOT_ROOT is not set +# CONFIG_RDATE is not set # CONFIG_READPROFILE is not set # CONFIG_SETARCH is not set -CONFIG_SWAPONOFF=y +# CONFIG_SWAPONOFF is not set # CONFIG_SWITCH_ROOT is not set CONFIG_UMOUNT=y CONFIG_FEATURE_UMOUNT_ALL=y @@ -465,24 +465,24 @@ CONFIG_FEATURE_MOUNT_LOOP=y # CONFIG_MT is not set # CONFIG_RUNLEVEL is not set # CONFIG_RX is not set -CONFIG_STRINGS=y +# CONFIG_STRINGS is not set # CONFIG_SETSID is not set # CONFIG_TASKSET is not set -CONFIG_TIME=y +# CONFIG_TIME is not set # CONFIG_WATCHDOG is not set # # Networking Utilities # -# CONFIG_FEATURE_IPV6 is not set +CONFIG_FEATURE_IPV6=y # CONFIG_ARPING is not set # CONFIG_DNSD is not set # CONFIG_ETHER_WAKE is not set # CONFIG_FAKEIDENTD is not set -CONFIG_FTPGET=y -CONFIG_FTPPUT=y +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set -CONFIG_HOSTNAME=y +# CONFIG_HOSTNAME is not set # CONFIG_HTTPD is not set # CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set # CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set @@ -514,8 +514,8 @@ CONFIG_HOSTNAME=y # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set # CONFIG_FEATURE_INETD_RPC is not set -# CONFIG_IP is not set -# CONFIG_FEATURE_IP_ADDRESS is not set +CONFIG_IP=y +CONFIG_FEATURE_IP_ADDRESS=y # CONFIG_FEATURE_IP_LINK is not set # CONFIG_FEATURE_IP_ROUTE is not set # CONFIG_FEATURE_IP_TUNNEL is not set @@ -532,15 +532,15 @@ CONFIG_HOSTNAME=y # CONFIG_NC_GAPING_SECURITY_HOLE is not set # CONFIG_NETSTAT is not set # CONFIG_NSLOOKUP is not set -CONFIG_PING=y -CONFIG_FEATURE_FANCY_PING=y +# CONFIG_PING is not set +# CONFIG_FEATURE_FANCY_PING is not set # CONFIG_PING6 is not set # CONFIG_FEATURE_FANCY_PING6 is not set # CONFIG_ROUTE is not set -CONFIG_TELNET=y -CONFIG_FEATURE_TELNET_TTYPE=y -CONFIG_FEATURE_TELNET_AUTOLOGIN=y -CONFIG_TELNETD=y +# CONFIG_TELNET is not set +# CONFIG_FEATURE_TELNET_TTYPE is not set +# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set +# CONFIG_TELNETD is not set # CONFIG_FEATURE_TELNETD_INETD is not set CONFIG_TFTP=y CONFIG_FEATURE_TFTP_GET=y @@ -556,17 +556,17 @@ CONFIG_FEATURE_TFTP_BLOCKSIZE=y # udhcp Server/Client # # CONFIG_APP_UDHCPD is not set -# CONFIG_APP_UDHCPC is not set +CONFIG_APP_UDHCPC=y # CONFIG_APP_DUMPLEASES is not set # CONFIG_FEATURE_UDHCP_SYSLOG is not set # CONFIG_FEATURE_UDHCP_DEBUG is not set # CONFIG_VCONFIG is not set -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y +# CONFIG_WGET is not set +# CONFIG_FEATURE_WGET_STATUSBAR is not set +# CONFIG_FEATURE_WGET_AUTHENTICATION is not set # CONFIG_FEATURE_WGET_IP6_LITERAL is not set # CONFIG_FEATURE_WGET_LONG_OPTIONS is not set -# CONFIG_ZCIP is not set +CONFIG_ZCIP=y # # Process Utilities @@ -582,8 +582,8 @@ CONFIG_PS=y # CONFIG_FEATURE_PS_WIDE is not set CONFIG_RENICE=y # CONFIG_BB_SYSCTL is not set -# CONFIG_TOP is not set -# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y # CONFIG_UPTIME is not set # @@ -616,7 +616,7 @@ CONFIG_FEATURE_SH_IS_NONE=y # 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=0 +# CONFIG_FEATURE_COMMAND_HISTORY is not set # CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set # CONFIG_FEATURE_COMMAND_TAB_COMPLETION is not set # CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set @@ -625,12 +625,12 @@ CONFIG_FEATURE_COMMAND_HISTORY=0 # # System Logging Utilities # -CONFIG_SYSLOGD=y -CONFIG_FEATURE_ROTATE_LOGFILE=y +# CONFIG_SYSLOGD is not set +# CONFIG_FEATURE_ROTATE_LOGFILE is not set # CONFIG_FEATURE_REMOTE_LOG is not set # CONFIG_FEATURE_IPC_SYSLOG is not set -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 +# CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE is not set # CONFIG_LOGREAD is not set # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set -CONFIG_KLOGD=y -CONFIG_LOGGER=y +# CONFIG_KLOGD is not set +# CONFIG_LOGGER is not set diff -uprN -X dontdiff.uclinux-rootfs uclinux-rootfs.org/vendors/Broadcom/97402c0/config.vendor-2.6.x uclinux-rootfs/vendors/Broadcom/97402c0/config.vendor-2.6.x --- uclinux-rootfs.org/vendors/Broadcom/97402c0/config.vendor-2.6.x 2007-02-03 05:14:40.000000000 +0900 +++ uclinux-rootfs/vendors/Broadcom/97402c0/config.vendor-2.6.x 2008-05-28 13:45:51.000000000 +0900 @@ -1,5 +1,5 @@ # -# Automatically generated make config: don't edit +# Automatically generated by make menuconfig: don't edit # # @@ -52,22 +52,22 @@ CONFIG_LIB_LIBTERMCAP=y # Force build (Normally built when required) # # CONFIG_LIB_DIRECTFB_FORCE is not set -CONFIG_LIB_FREETYPE_FORCE=y +# CONFIG_LIB_FREETYPE_FORCE is not set # CONFIG_LIB_LIBDES_FORCE is not set # CONFIG_LIB_LIBSSL_FORCE is not set # CONFIG_LIB_LIBGMP_FORCE is not set # CONFIG_LIB_LIBG_FORCE is not set # CONFIG_LIB_LIBPAM_FORCE is not set # CONFIG_LIB_LIBPCAP_FORCE is not set -CONFIG_LIB_ZLIB_FORCE=y +# CONFIG_LIB_ZLIB_FORCE is not set # CONFIG_LIB_LIBATM_FORCE is not set -CONFIG_LIB_LIBPNG_FORCE=y -CONFIG_LIB_LIBJPEG_FORCE=y +# CONFIG_LIB_LIBPNG_FORCE is not set +# CONFIG_LIB_LIBJPEG_FORCE is not set # CONFIG_LIB_NCURSES_FORCE is not set -CONFIG_LIB_FREETYPE=y -CONFIG_LIB_LIBJPEG=y -CONFIG_LIB_LIBPNG=y -CONFIG_LIB_ZLIB=y +# CONFIG_LIB_FREETYPE is not set +# CONFIG_LIB_LIBJPEG is not set +# CONFIG_LIB_LIBPNG is not set +# CONFIG_LIB_ZLIB is not set # # Library Configuration @@ -86,9 +86,9 @@ CONFIG_LIB_ZLIB=y # # MTD utils # -CONFIG_USER_MTDUTILS=y -CONFIG_USER_MTDUTILS_ERASE=y -CONFIG_USER_MTDUTILS_ERASEALL=y +# CONFIG_USER_MTDUTILS is not set +# CONFIG_USER_MTDUTILS_ERASE is not set +# CONFIG_USER_MTDUTILS_ERASEALL is not set # CONFIG_USER_MTDUTILS_FTL_CHECK is not set # CONFIG_USER_MTDUTILS_FTL_FORMAT is not set # CONFIG_USER_MTDUTILS_MKFSJFFS is not set @@ -99,7 +99,6 @@ CONFIG_USER_MTDUTILS_ERASEALL=y # CONFIG_USER_MTDUTILS_NANDTEST is not set # CONFIG_USER_MTDUTILS_NANDWRITE is not set # CONFIG_USER_MTDUTILS_DOC_LOADBIOS is not set -CONFIG_LIB_ZLIB=y # # Filesystem Applications @@ -107,22 +106,22 @@ CONFIG_LIB_ZLIB=y # CONFIG_USER_FLATFSD_FLATFSD is not set # CONFIG_USER_MOUNT_MOUNT is not set # CONFIG_USER_MOUNT_UMOUNT is not set -CONFIG_USER_FDISK_FDISK=y -CONFIG_USER_HDPARM_HDPARM=y +# CONFIG_USER_FDISK_FDISK is not set +# CONFIG_USER_HDPARM_HDPARM is not set # # EXT2 # -CONFIG_USER_E2FSPROGS_E2FSCK_E2FSCK=y -CONFIG_USER_E2FSPROGS_MISC_MKE2FS=y -CONFIG_USER_E2FSPROGS_MISC_BADBLOCKS=y +# CONFIG_USER_E2FSPROGS_E2FSCK_E2FSCK is not set +# CONFIG_USER_E2FSPROGS_MISC_MKE2FS is not set +# CONFIG_USER_E2FSPROGS_MISC_BADBLOCKS is not set # CONFIG_USER_E2FSPROGS_MISC_CHATTR is not set # CONFIG_USER_E2FSPROGS_MISC_DUMPE2FS is not set # CONFIG_USER_E2FSPROGS_MISC_E2LABEL is not set -CONFIG_USER_E2FSPROGS_MISC_FSCK=y +# CONFIG_USER_E2FSPROGS_MISC_FSCK is not set # CONFIG_USER_E2FSPROGS_MISC_LSATTR is not set -CONFIG_USER_E2FSPROGS_MISC_MKLOST_FOUND=y -CONFIG_USER_E2FSPROGS_MISC_TUNE2FS=y +# CONFIG_USER_E2FSPROGS_MISC_MKLOST_FOUND is not set +# CONFIG_USER_E2FSPROGS_MISC_TUNE2FS is not set # CONFIG_USER_E2FSPROGS_MISC_UUIDGEN is not set # @@ -166,18 +165,16 @@ CONFIG_LIB_ZLIB=y # # Network Applications # -CONFIG_USER_ROUTE_ARP=y +# CONFIG_USER_ROUTE_ARP is not set # CONFIG_USER_BOA_SRC_BOA is not set # CONFIG_USER_BPALOGIN_BPALOGIN is not set # CONFIG_USER_BR2684CTL_BR2684CTL is not set # CONFIG_USER_BRCFG_BRCFG is not set # CONFIG_USER_DHCPCD_DHCPCD is not set -CONFIG_USER_DHCPCD_NEW_DHCPCD=y +# CONFIG_USER_DHCPCD_NEW_DHCPCD is not set # CONFIG_USER_DHCPD_DHCPD is not set # CONFIG_USER_DHCP_ISC_SERVER_DHCPD is not set # CONFIG_USER_DHCP_ISC_CLIENT_DHCP is not set -# CONFIG_USER_DHCPCV6_DHCPCV6 is not set -# CONFIG_USER_DHCPSV6_DHCPSV6 is not set # CONFIG_USER_DIALD_DIALD is not set # CONFIG_USER_DISCARD_DISCARD is not set # CONFIG_USER_DNSMASQ_DNSMASQ is not set @@ -189,7 +186,7 @@ CONFIG_USER_DHCPCD_NEW_DHCPCD=y # CONFIG_USER_HTTPD_HTTPD is not set # CONFIG_USER_IDB_IDB is not set # CONFIG_USER_IFATTACH_IFATTACH is not set -CONFIG_USER_ROUTE_IFCONFIG=y +# CONFIG_USER_ROUTE_IFCONFIG is not set # CONFIG_USER_INETD_INETD is not set # CONFIG_USER_IPCHAINS_IPCHAINS is not set # CONFIG_USER_IPERF is not set @@ -198,7 +195,7 @@ CONFIG_USER_ROUTE_IFCONFIG=y # CONFIG_USER_IPPORTFW_IPPORTFW is not set # CONFIG_USER_IPREDIR_IPREDIR is not set # CONFIG_USER_IPROUTE2 is not set -# CONFIG_USER_IPTABLES_IPTABLES is not set +CONFIG_USER_IPTABLES_IPTABLES=y # CONFIG_USER_KLAXON_KLAXON is not set # CONFIG_USER_L2TPD_L2TPD is not set # CONFIG_USER_LOATTACH_LOATTACH is not set @@ -211,14 +208,14 @@ CONFIG_USER_ROUTE_IFCONFIG=y # CONFIG_USER_ROUTE_MIITOOL is not set # CONFIG_USER_PING_PING is not set # CONFIG_USER_PLUG_PLUG is not set -CONFIG_USER_PORTMAP_PORTMAP=y +# CONFIG_USER_PORTMAP_PORTMAP is not set # CONFIG_USER_PPPD_PPPD_PPPD is not set # CONFIG_USER_PPTPD_PPTPCTRL is not set # CONFIG_USER_PPTPD_PPTPD is not set # CONFIG_USER_PPTP_CLIENT_PPTP is not set # CONFIG_USER_PPTP_CLIENT_PPTP_CALLMGR is not set # CONFIG_USER_RDATE_RDATE is not set -CONFIG_USER_ROUTE_ROUTE=y +# CONFIG_USER_ROUTE_ROUTE is not set # CONFIG_USER_ROUTED_ROUTED is not set # CONFIG_USER_RP_PPPOE_PPPOE is not set # CONFIG_USER_SETHDLC_SETHDLC is not set @@ -240,7 +237,7 @@ CONFIG_USER_ROUTE_ROUTE=y # CONFIG_USER_THTTPD_THTTPD is not set # CONFIG_USER_TRACEROUTE_TRACEROUTE is not set # CONFIG_USER_UCDSNMP_SNMPD is not set -CONFIG_USER_UTELNETD=y +# CONFIG_USER_UTELNETD is not set # CONFIG_USER_VPNLED_VPNLED is not set # CONFIG_USER_WGET is not set # CONFIG_USER_ZEBRA_ZEBRA_ZEBRA is not set @@ -248,14 +245,14 @@ CONFIG_USER_UTELNETD=y # # Net-tools # -# CONFIG_USER_NET_TOOLS_ARP is not set -# CONFIG_USER_NET_TOOLS_HOSTNAME is not set -# CONFIG_USER_NET_TOOLS_IFCONFIG is not set -# CONFIG_USER_NET_TOOLS_NAMEIF is not set -# CONFIG_USER_NET_TOOLS_NETSTAT is not set -# CONFIG_USER_NET_TOOLS_PLIPCONFIG is not set -# CONFIG_USER_NET_TOOLS_RARP is not set -# CONFIG_USER_NET_TOOLS_ROUTE is not set +CONFIG_USER_NET_TOOLS_ARP=y +CONFIG_USER_NET_TOOLS_HOSTNAME=y +CONFIG_USER_NET_TOOLS_IFCONFIG=y +CONFIG_USER_NET_TOOLS_NAMEIF=y +CONFIG_USER_NET_TOOLS_NETSTAT=y +CONFIG_USER_NET_TOOLS_PLIPCONFIG=y +CONFIG_USER_NET_TOOLS_RARP=y +CONFIG_USER_NET_TOOLS_ROUTE=y # CONFIG_USER_NET_TOOLS_SLATTACH is not set # CONFIG_USER_NET_TOOLS_MII_TOOL is not set @@ -282,7 +279,7 @@ CONFIG_USER_UTELNETD=y # CONFIG_USER_DHRYSTONE_DHRYSTONE is not set # CONFIG_USER_FROB_LED_FROB_LED is not set # CONFIG_USER_GDBSERVER_GDBREPLAY is not set -CONFIG_USER_GDBSERVER_GDBSERVER=y +# CONFIG_USER_GDBSERVER_GDBSERVER is not set # CONFIG_USER_HD_HD is not set # CONFIG_USER_LCD_LCD is not set # CONFIG_USER_LEDCON_LEDCON is not set @@ -299,11 +296,11 @@ CONFIG_USER_GDBSERVER_GDBSERVER=y # CONFIG_USER_ROOTLOADER_ROOTLOADER is not set # CONFIG_USER_SETSERIAL_SETSERIAL is not set # CONFIG_USER_TRIPWIRE_SIGGEN is not set -CONFIG_USER_STRACE_STRACE=y +# CONFIG_USER_STRACE_STRACE is not set # CONFIG_USER_STTY_STTY is not set # CONFIG_USER_TCSH_TCSH is not set # CONFIG_USER_THREADDEMOS_THREADDEMOS is not set -CONFIG_USER_TIP_TIP=y +# CONFIG_USER_TIP_TIP is not set # CONFIG_USER_TRIPWIRE_TRIPWIRE is not set # @@ -408,7 +405,7 @@ CONFIG_USER_SYSUTILS_PS=y # CONFIG_USER_PROCPS_TLOAD is not set CONFIG_USER_PROCPS_TOP=y # CONFIG_USER_PROCPS_UPTIME is not set -CONFIG_USER_PROCPS_VMSTAT=y +# CONFIG_USER_PROCPS_VMSTAT is not set # CONFIG_USER_PROCPS_W is not set # CONFIG_USER_PROCPS_WATCH is not set CONFIG_LIB_NCURSES=y @@ -477,12 +474,5 @@ CONFIG_USER_RAMIMAGE_NONE=y # # CONFIG_LIB_DEBUG is not set # CONFIG_USER_DEBUG is not set -# CONFIG_USER_PROFILE_OPROFILE is not set -# CONFIG_USER_PROFILE_POFT is not set - -# -# Debug tools -# # CONFIG_USER_TIMEPEG_TPT is not set -# CONFIG_USER_LTT_TRACEDAEMON is not set - +# CONFIG_USER_PROFILE_OPROFILE is not set diff -uprN -X dontdiff.uclinux-rootfs uclinux-rootfs.org/vendors/Broadcom/common/etc/init.d/rcS uclinux-rootfs/vendors/Broadcom/common/etc/init.d/rcS --- uclinux-rootfs.org/vendors/Broadcom/common/etc/init.d/rcS 2007-02-03 05:14:29.000000000 +0900 +++ uclinux-rootfs/vendors/Broadcom/common/etc/init.d/rcS 2008-05-28 13:45:51.000000000 +0900 @@ -28,71 +28,71 @@ chgrp utmp /var/run/utmp /var/log/wtmp chmod 0664 /var/run/utmp /var/log/wtmp # Start syslogd -echo "Start syslog daemon" -syslogd & +#echo "Start syslog daemon" +#syslogd & # Configure network interface -echo "Configure Network interface" +#echo "Configure Network interface" # For bcm97110-docsis only ###insmod /lib/modules/`uname -r`/kernel/drivers/net/et.o -sleep 6 +#sleep 6 # If we boot from NFS, then we don't need the Network, use whatever # was set up by NFS, # otherwise look at the kernel parameter netconf=, # -if [ -z "`cat /proc/mounts |grep /dev/root |grep '\'`" ]; then - if [ -z "$netconf" ]; then - ifconfig lo 127.0.0.1 netmask 255.0.0.0 - rm -f /etc/resolv.conf - if [ -f /var/run/dhcpcd-eth0.pid ]; then - rm -f /var/run/dhcpcd-eth0.pid - fi - # PR21492 - new dhcpcd use different dir to store *.pid - if [ -f /etc/config/dhcpc/dhcpcd-eth0.pid ]; then - rm -f /etc/config/dhcpc/dhcpcd-eth0.pid - fi - echo "dhcpcd -Hd eth0" - dhcpcd -Hd eth0 & - else - netdev=`echo "$netconf" | cut -f1 -d','` - ip=`echo "$netconf" | cut -f2 -d','` - case "$ip" in - none) - echo "Network not started" - ;; - dhcp) - ifconfig lo 127.0.0.1 netmask 255.0.0.0 - rm -f /etc/resolv.conf - if [ -f /var/run/dhcpcd-${netdev}.pid ]; then - rm -f /var/run/dhcpcd-${netdev}.pid - fi - # PR21492 - new dhcpcd use different dir to store *.pid - if [ -f /etc/config/dhcpc/dhcpcd-${netdev}.pid ]; then - rm -f /etc/config/dhcpc/dhcpcd-${netdev}.pid - fi - echo "dhcpcd -Hd $netdev" - dhcpcd -Hd "$netdev" & - ;; - - *) # If the user specifies the wrong syntax, there is nothing we can do - ipaddr=`echo "$ip" | cut -f1 -d':'` - netmask=`echo "$ip" | cut -f2 -d':'` - echo "ifconfig $netdev $ipaddr netmask $netmask up" - ifconfig "$netdev" "$ipaddr" netmask "$netmask" up - ifconfig lo 127.0.0.1 netmask 255.0.0.0 - ;; - esac - fi -fi +#if [ -z "`cat /proc/mounts |grep /dev/root |grep '\'`" ]; then +# if [ -z "$netconf" ]; then +# ifconfig lo 127.0.0.1 netmask 255.0.0.0 +# rm -f /etc/resolv.conf +# if [ -f /var/run/dhcpcd-eth0.pid ]; then +# rm -f /var/run/dhcpcd-eth0.pid +# fi +# # PR21492 - new dhcpcd use different dir to store *.pid +# if [ -f /etc/config/dhcpc/dhcpcd-eth0.pid ]; then +# rm -f /etc/config/dhcpc/dhcpcd-eth0.pid +# fi +# echo "dhcpcd -Hd eth0" +# dhcpcd -Hd eth0 & +# else +# netdev=`echo "$netconf" | cut -f1 -d','` +# ip=`echo "$netconf" | cut -f2 -d','` +# case "$ip" in +# none) +# echo "Network not started" +# ;; +# dhcp) +# ifconfig lo 127.0.0.1 netmask 255.0.0.0 +# rm -f /etc/resolv.conf +# if [ -f /var/run/dhcpcd-${netdev}.pid ]; then +# rm -f /var/run/dhcpcd-${netdev}.pid +# fi +# # PR21492 - new dhcpcd use different dir to store *.pid +# if [ -f /etc/config/dhcpc/dhcpcd-${netdev}.pid ]; then +# rm -f /etc/config/dhcpc/dhcpcd-${netdev}.pid +# fi +# echo "dhcpcd -Hd $netdev" +# dhcpcd -Hd "$netdev" & +# ;; +# +# *) # If the user specifies the wrong syntax, there is nothing we can do +# ipaddr=`echo "$ip" | cut -f1 -d':'` +# netmask=`echo "$ip" | cut -f2 -d':'` +# echo "ifconfig $netdev $ipaddr netmask $netmask up" +# ifconfig "$netdev" "$ipaddr" netmask "$netmask" up +# ifconfig lo 127.0.0.1 netmask 255.0.0.0 +# ;; +# esac +# fi +#fi # Start up services -echo "start services" -portmap & +#echo "start services" +#portmap & # PR17638: Use daemon option for utelnetd -utelnetd -d +#utelnetd -d #Start user service if it exists if [ -f /root/rc.user ]; then diff -uprN -X dontdiff.uclinux-rootfs uclinux-rootfs.org/vendors/Broadcom/common/etc/inittab uclinux-rootfs/vendors/Broadcom/common/etc/inittab --- uclinux-rootfs.org/vendors/Broadcom/common/etc/inittab 2007-02-03 05:14:29.000000000 +0900 +++ uclinux-rootfs/vendors/Broadcom/common/etc/inittab 2008-05-28 13:45:51.000000000 +0900 @@ -21,7 +21,7 @@ #tty2::respawn:/sbin/getty 38400 tty2 # Put a getty on the serial port -ttyS0::respawn:/bin/getty -L ttyS0 115200 vt102 +ttyS0::respawn:/bin/getty -L ttyS0 38400 vt102 #@@@@@ttyS1::respawn:/bin/getty -L ttyS1 115200 vt102 #ttyS0::respawn:/bin/sh diff -uprN -X dontdiff.uclinux-rootfs uclinux-rootfs.org/vendors/Broadcom/common/etc/passwd uclinux-rootfs/vendors/Broadcom/common/etc/passwd --- uclinux-rootfs.org/vendors/Broadcom/common/etc/passwd 2007-02-03 05:14:29.000000000 +0900 +++ uclinux-rootfs/vendors/Broadcom/common/etc/passwd 2008-05-28 13:26:19.000000000 +0900 @@ -1,4 +1,4 @@ -root::0:0:root:/root:/bin/sh +root:iFytoQYvUzJck:0:0:root:/root:/bin/sh bin:*:1:1:bin:/bin:/dev/null daemon:*:2:2:daemon:/sbin:/dev/null adm:*:3:4:adm:/var/tmp:/dev/null diff -uprN -X dontdiff.uclinux-rootfs uclinux-rootfs.org/vendors/Broadcom/common/etc/simple.script uclinux-rootfs/vendors/Broadcom/common/etc/simple.script --- uclinux-rootfs.org/vendors/Broadcom/common/etc/simple.script 1970-01-01 09:00:00.000000000 +0900 +++ uclinux-rootfs/vendors/Broadcom/common/etc/simple.script 2008-05-28 13:45:51.000000000 +0900 @@ -0,0 +1,40 @@ +#!/bin/sh + +# udhcpc script edited by Tim Riker + +[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 + +RESOLV_CONF="/etc/resolv.conf" +[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast" +[ -n "$subnet" ] && NETMASK="netmask $subnet" + +case "$1" in + deconfig) + ifconfig $interface 0.0.0.0 + ;; + + renew|bound) + ifconfig $interface $ip $BROADCAST $NETMASK + + if [ -n "$router" ] ; then + echo "deleting routers" + while route del default gw 0.0.0.0 dev $interface ; do + : + done + + metric=0 + for i in $router ; do + route add default gw $i dev $interface metric $((metric++)) + done + fi + + echo -n > $RESOLV_CONF + [ -n "$domain" ] && echo search $domain >> $RESOLV_CONF + for i in $dns ; do + echo adding dns $i + echo nameserver $i >> $RESOLV_CONF + done + ;; +esac + +exit 0 diff -uprN -X dontdiff.uclinux-rootfs uclinux-rootfs.org/vendors/Broadcom/common/etc/zcip.script uclinux-rootfs/vendors/Broadcom/common/etc/zcip.script --- uclinux-rootfs.org/vendors/Broadcom/common/etc/zcip.script 1970-01-01 09:00:00.000000000 +0900 +++ uclinux-rootfs/vendors/Broadcom/common/etc/zcip.script 2008-05-28 13:45:51.000000000 +0900 @@ -0,0 +1,37 @@ +#!/bin/sh + +# only for use as a "zcip" callback script +if [ "x$interface" = x ] +then + exit 1 +fi + +# zcip should start on boot/resume and various media changes +case "$1" in +init) + # for now, zcip requires the link to be already up, + # and it drops links when they go down. that isn't + # the most robust model... + exit 0 + ;; +config) + if [ "x$ip" = x ] + then + exit 1 + fi + # remember $ip for $interface, to use on restart + if [ "x$IP" != x -a -w "$IP.$interface" ] + then + echo $ip > "$IP.$interface" + fi + exec ifconfig $interface $ip netmask 255.255.0.0 + ;; +deconfig) + if [ x$ip = x ] + then + exit 1 + fi + exec ip address del dev $interface local $ip + ;; +esac +exit 1 diff -uprN -X dontdiff.uclinux-rootfs uclinux-rootfs.org/vendors/Broadcom/common/var/tmp/mountvar.sh uclinux-rootfs/vendors/Broadcom/common/var/tmp/mountvar.sh --- uclinux-rootfs.org/vendors/Broadcom/common/var/tmp/mountvar.sh 2007-02-03 05:14:29.000000000 +0900 +++ uclinux-rootfs/vendors/Broadcom/common/var/tmp/mountvar.sh 2008-05-28 13:45:51.000000000 +0900 @@ -2,7 +2,7 @@ mountType=`grep mtdblock0 /proc/mounts | cut -f4 | cut -f1 -d','` -echo "mountType=$mountType" +#echo "mountType=$mountType" case "$mountType" in rw) exit @@ -10,14 +10,18 @@ rw) esac if [ -f /tmpfsvar.img ]; then - echo "mount -nt tmpfs -o size=512k,mode=777 /tmpfsvar.img /var" +# echo "mount -nt tmpfs -o size=512k,mode=777 /tmpfsvar.img /var" mount -nt tmpfs -o size=512k,mode=777 /tmpfsvar.img /var cd /var tar -xvf /var.img 1>/dev/null 2>/dev/null fi +if [ -f /tmpfsupd.img ]; then + mount -nt tmpfs -o size=8M,mode=777 /tmpfsupd.img /mnt/upd +fi + if [ -f /tmpfsetc.img ]; then - echo "mount -nt tmpfs -o size=256k,mode=777 /tmpfsetc.img /etc" +# echo "mount -nt tmpfs -o size=256k,mode=777 /tmpfsetc.img /etc" mount -nt tmpfs -o size=256k,mode=777 /tmpfsetc.img /etc cd /etc tar -xvf /etc.img 2>/dev/null 1>/dev/null diff -uprN -X dontdiff.uclinux-rootfs uclinux-rootfs.org/vendors/Broadcom/common/var/tmp/rcS uclinux-rootfs/vendors/Broadcom/common/var/tmp/rcS --- uclinux-rootfs.org/vendors/Broadcom/common/var/tmp/rcS 2007-02-03 05:14:29.000000000 +0900 +++ uclinux-rootfs/vendors/Broadcom/common/var/tmp/rcS 2008-05-28 13:45:51.000000000 +0900 @@ -3,17 +3,16 @@ # Set the path export PATH=/bin:/sbin:/usr/bin:/usr/sbin:. - # Mount /proc -echo "Mount /proc fs" +#echo "Mount /proc fs" mount -t proc none /proc # Mount RW tmpfs, rely on /proc being mounted -echo "Restore RW directories" -/bin/bash /etc/mountvar.sh +#echo "Restore RW directories" +/bin/bash /var/tmp/mountvar.sh # Mount /dev/pts -echo "Mount /dev/pts" +#echo "Mount /dev/pts" mount -t devpts none /dev/pts # Setup up /etc/mtab link @@ -26,88 +25,82 @@ ln -sf /proc/mounts /etc/mtab # stty brkint # Clean up utmp/wtmp -echo "Cleaning up utmp and wtmp" +#echo "Cleaning up utmp and wtmp" cat /dev/null > /var/run/utmp cat /dev/null > /var/log/wtmp chgrp utmp /var/run/utmp /var/log/wtmp chmod 0664 /var/run/utmp /var/log/wtmp # Start syslogd -echo "Start syslog daemon" -syslogd & +#echo "Start syslog daemon" +#syslogd & # Configure network interface -echo "Configure Network interface" +#echo "Configure Network interface" # For bcm97110-docsis only ###insmod /lib/modules/`uname -r`/kernel/drivers/net/et.o -sleep 6 +#sleep 6 # If we boot from NFS, then we don't need the Network, use whatever # was set up by NFS, -# otherwise look at the kernel parameter network=, +# otherwise look at the kernel parameter netconf=, # -if [ -z "`cat /proc/mounts |grep /dev/root |grep '\'`" ]; then - if [ -z "$netconf" ]; then - ifconfig lo 127.0.0.1 netmask 255.0.0.0 - rm -f /etc/resolv.conf - if [ -f /var/run/dhcpcd-eth0.pid ]; then - rm -f /var/run/dhcpcd-eth0.pid - fi - # PR21492 - new dhcpcd use different dir to store *.pid - if [ -f /etc/config/dhcpc/dhcpcd-eth0.pid ]; then - rm -f /etc/config/dhcpc/dhcpcd-eth0.pid - fi - #jipeng - PR22427 dhcpcd failed with cramfs - echo "dhcpcd -Hd -L /var/run eth0" - dhcpcd -Hd -L /var/run eth0 & - #echo "dhcpcd -Hd eth0" - #dhcpcd -Hd eth0 & - else - netdev=`echo "$netconf" | cut -f1 -d','` - ip=`echo "$netconf" | cut -f2 -d','` - case "$ip" in - none) - echo "Network not started" - ;; - dhcp) - ifconfig lo 127.0.0.1 netmask 255.0.0.0 - rm -f /etc/resolv.conf - if [ -f /var/run/dhcpcd-${netdev}.pid ]; then - rm -f /var/run/dhcpcd-${netdev}.pid - fi - # PR21492 - new dhcpcd use different dir to store *.pid - if [ -f /etc/config/dhcpc/dhcpcd-eth0.pid ]; then - rm -f /etc/config/dhcpc/dhcpcd-eth0.pid - fi - #jipeng - PR22427 dhcpcd failed with cramfs - echo "dhcpcd -Hd -L /var/run eth0" - dhcpcd -Hd -L /var/run eth0 & - #echo "dhcpcd -Hd $netdev" - #dhcpcd -Hd "$netdev" & - ;; - - *) # If the user specifies the wrong syntax, there is nothing we can do - ipaddr=`echo "$ip" | cut -f1 -d':'` - netmask=`echo "$ip" | cut -f2 -d':'` - echo "ifconfig $netdev $ipaddr netmask $netmask up" - ifconfig "$netdev" "$ipaddr" netmask "$netmask" up - ifconfig lo 127.0.0.1 netmask 255.0.0.0 - ;; - esac - fi -fi - +#if [ -z "`cat /proc/mounts |grep /dev/root |grep '\'`" ]; then +# if [ -z "$netconf" ]; then +# ifconfig lo 127.0.0.1 netmask 255.0.0.0 +# rm -f /etc/resolv.conf +# if [ -f /var/run/dhcpcd-eth0.pid ]; then +# rm -f /var/run/dhcpcd-eth0.pid +# fi +# # PR21492 - new dhcpcd use different dir to store *.pid +# if [ -f /etc/config/dhcpc/dhcpcd-eth0.pid ]; then +# rm -f /etc/config/dhcpc/dhcpcd-eth0.pid +# fi +# echo "dhcpcd -Hd eth0" +# dhcpcd -Hd eth0 & +# else +# netdev=`echo "$netconf" | cut -f1 -d','` +# ip=`echo "$netconf" | cut -f2 -d','` +# case "$ip" in +# none) +# echo "Network not started" +# ;; +# dhcp) +# ifconfig lo 127.0.0.1 netmask 255.0.0.0 +# rm -f /etc/resolv.conf +# if [ -f /var/run/dhcpcd-${netdev}.pid ]; then +# rm -f /var/run/dhcpcd-${netdev}.pid +# fi +# # PR21492 - new dhcpcd use different dir to store *.pid +# if [ -f /etc/config/dhcpc/dhcpcd-${netdev}.pid ]; then +# rm -f /etc/config/dhcpc/dhcpcd-${netdev}.pid +# fi +# echo "dhcpcd -Hd $netdev" +# dhcpcd -Hd "$netdev" & +# ;; +# +# *) # If the user specifies the wrong syntax, there is nothing we can do +# ipaddr=`echo "$ip" | cut -f1 -d':'` +# netmask=`echo "$ip" | cut -f2 -d':'` +# echo "ifconfig $netdev $ipaddr netmask $netmask up" +# ifconfig "$netdev" "$ipaddr" netmask "$netmask" up +# ifconfig lo 127.0.0.1 netmask 255.0.0.0 +# ;; +# esac +# fi +#fi # Start up services -echo "start services" -portmap & -# PR17638: Add daemonize option to utelnetd. -utelnetd -d +#echo "start services" +#portmap & +# PR17638: Use daemon option for utelnetd +#utelnetd -d -#Start user services if it exists +#Start user service if it exists if [ -f /root/rc.user ]; then - echo "start user services" + #echo "start user services" /bin/sh /root/rc.user fi +