Unslung: major change - Linksys busybox now subsumed by slingbox; cpio and find

are no longer required; rc.bootdisk functionality introduced in unslung-rootfs

diff --git a/packages/busybox/slingbox-1.2.2/defconfig b/packages/busybox/slingbox-1.2.2/defconfig
index a9b167a..8026cfc 100644 (file)
--- a/packages/busybox/slingbox-1.2.2/defconfig
+++ b/packages/busybox/slingbox-1.2.2/defconfig
@@ -10,37 +10,41 @@ HAVE_DOT_CONFIG=y
 #
 # General Configuration
 #
+# 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
+CONFIG_FEATURE_COMPRESS_USAGE=y
 # CONFIG_FEATURE_INSTALLER is not set
 # CONFIG_LOCALE_SUPPORT is not set
-# CONFIG_FEATURE_DEVFS is not set
+CONFIG_GETOPT_LONG=y
 # CONFIG_FEATURE_DEVPTS is not set
 # CONFIG_FEATURE_CLEAN_UP is not set
 # CONFIG_FEATURE_SUID is not set
 # CONFIG_FEATURE_SUID_CONFIG is not set
 # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
 # CONFIG_SELINUX is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
 
 #
 # Build Options
 #
 # CONFIG_STATIC is not set
-# CONFIG_DISABLE_SHARED is not set
 # CONFIG_BUILD_LIBBUSYBOX is not set
 # CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
 # CONFIG_FEATURE_SHARED_BUSYBOX is not set
 CONFIG_LFS=y
 USING_CROSS_COMPILER=y
-CROSS_COMPILER_PREFIX="armv5b-softfloat-linux-"
+CROSS_COMPILER_PREFIX="armeb-linux-"
 # CONFIG_BUILD_AT_ONCE is not set
 
 #
 # Debugging Options
 #
 # CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
 # CONFIG_NO_DEBUG_LIB is not set
 # CONFIG_DMALLOC is not set
 # CONFIG_EFENCE is not set
@@ -70,7 +74,7 @@ CONFIG_MD5_SIZE_VS_SPEED=2
 # CONFIG_AR is not set
 # CONFIG_FEATURE_AR_LONG_FILENAMES is not set
 CONFIG_BUNZIP2=y
-# CONFIG_CPIO is not set
+CONFIG_CPIO=y
 # CONFIG_DPKG is not set
 # CONFIG_DPKG_DEB is not set
 # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
@@ -83,12 +87,12 @@ CONFIG_TAR=y
 CONFIG_FEATURE_TAR_CREATE=y
 CONFIG_FEATURE_TAR_BZIP2=y
 # CONFIG_FEATURE_TAR_LZMA is not set
-# CONFIG_FEATURE_TAR_FROM is not set
+CONFIG_FEATURE_TAR_FROM=y
 CONFIG_FEATURE_TAR_GZIP=y
 CONFIG_FEATURE_TAR_COMPRESS=y
-CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y
+# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
 CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
-CONFIG_FEATURE_TAR_LONG_OPTIONS=y
+# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
 CONFIG_UNCOMPRESS=y
 # CONFIG_UNLZMA is not set
 # CONFIG_FEATURE_LZMA_FAST is not set
@@ -105,29 +109,38 @@ CONFIG_UNZIP=y
 #
 # Coreutils
 #
-# CONFIG_BASENAME is not set
+CONFIG_BASENAME=y
 # CONFIG_CAL is not set
-# CONFIG_CAT is not set
-# CONFIG_CHGRP is not set
-# CONFIG_CHMOD is not set
-# CONFIG_CHOWN is not set
+CONFIG_CAT=y
+# CONFIG_CATV is not set
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
 CONFIG_CHROOT=y
+# CONFIG_CKSUM is not set
 # CONFIG_CMP is not set
 # CONFIG_COMM is not set
-# CONFIG_CP is not set
+CONFIG_CP=y
 CONFIG_CUT=y
 # CONFIG_DATE is not set
 # CONFIG_FEATURE_DATE_ISOFMT is not set
-# CONFIG_DD is not set
-# CONFIG_DF is not set
+CONFIG_DD=y
+# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set
+# CONFIG_FEATURE_DD_IBS_OBS is not set
+CONFIG_DF=y
+# CONFIG_DIFF is not set
+# CONFIG_FEATURE_DIFF_BINARY is not set
+# CONFIG_FEATURE_DIFF_DIR is not set
+# CONFIG_FEATURE_DIFF_MINIMAL is not set
 CONFIG_DIRNAME=y
-# CONFIG_DOS2UNIX is not set
-# CONFIG_UNIX2DOS is not set
+CONFIG_DOS2UNIX=y
+CONFIG_UNIX2DOS=y
 CONFIG_DU=y
-CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y
-# CONFIG_ECHO is not set
-# CONFIG_FEATURE_FANCY_ECHO is not set
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
 # CONFIG_ENV is not set
+# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
 CONFIG_EXPR=y
 # CONFIG_EXPR_MATH_SUPPORT_64 is not set
 # CONFIG_FALSE is not set
@@ -135,37 +148,40 @@ CONFIG_EXPR=y
 CONFIG_HEAD=y
 CONFIG_FEATURE_FANCY_HEAD=y
 # CONFIG_HOSTID is not set
-# CONFIG_ID is not set
+CONFIG_ID=y
 # CONFIG_INSTALL is not set
+# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
 # CONFIG_LENGTH is not set
-# CONFIG_LN is not set
+CONFIG_LN=y
 # CONFIG_LOGNAME is not set
-# CONFIG_LS is not set
-# CONFIG_FEATURE_LS_FILETYPES is not set
-# CONFIG_FEATURE_LS_FOLLOWLINKS is not set
-# CONFIG_FEATURE_LS_RECURSIVE is not set
-# CONFIG_FEATURE_LS_SORTFILES is not set
-# CONFIG_FEATURE_LS_TIMESTAMPS is not set
-# CONFIG_FEATURE_LS_USERNAME is not set
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
 # CONFIG_FEATURE_LS_COLOR is not set
 # CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
 CONFIG_MD5SUM=y
-# CONFIG_MKDIR is not set
+CONFIG_MKDIR=y
+# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set
 CONFIG_MKFIFO=y
-# CONFIG_MKNOD is not set
-# CONFIG_MV is not set
+CONFIG_MKNOD=y
+CONFIG_MV=y
+# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
 # CONFIG_NICE is not set
 # CONFIG_NOHUP is not set
 # CONFIG_OD is not set
 # CONFIG_PRINTENV is not set
 # CONFIG_PRINTF is not set
-# CONFIG_PWD is not set
+CONFIG_PWD=y
 # CONFIG_REALPATH is not set
-# CONFIG_RM is not set
+CONFIG_RM=y
 CONFIG_RMDIR=y
 # CONFIG_SEQ is not set
 # CONFIG_SHA1SUM is not set
-# CONFIG_SLEEP is not set
+CONFIG_SLEEP=y
 # CONFIG_FEATURE_FANCY_SLEEP is not set
 CONFIG_SORT=y
 # CONFIG_FEATURE_SORT_BIG is not set
@@ -173,14 +189,14 @@ CONFIG_SORT=y
 # CONFIG_FEATURE_STAT_FORMAT is not set
 # CONFIG_STTY is not set
 # CONFIG_SUM is not set
-# CONFIG_SYNC is not set
+CONFIG_SYNC=y
 CONFIG_TAIL=y
 CONFIG_FEATURE_FANCY_TAIL=y
 CONFIG_TEE=y
 # CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
-# CONFIG_TEST is not set
+CONFIG_TEST=y
 # CONFIG_FEATURE_TEST_64 is not set
-# CONFIG_TOUCH is not set
+CONFIG_TOUCH=y
 # CONFIG_TR is not set
 # CONFIG_FEATURE_TR_CLASSES is not set
 # CONFIG_FEATURE_TR_EQUIV is not set
@@ -196,6 +212,10 @@ CONFIG_UNIQ=y
 # CONFIG_WHO is not set
 # CONFIG_WHOAMI is not set
 # CONFIG_YES is not set
+
+#
+# Common options for cp and mv
+#
 # CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
 
 #
@@ -206,7 +226,7 @@ CONFIG_FEATURE_AUTOWIDTH=y
 #
 # Common options for df, du, ls
 #
-# CONFIG_FEATURE_HUMAN_READABLE is not set
+CONFIG_FEATURE_HUMAN_READABLE=y
 
 #
 # Common options for md5sum, sha1sum
@@ -225,7 +245,9 @@ CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
 # CONFIG_OPENVT is not set
 # CONFIG_RESET is not set
 # CONFIG_SETCONSOLE is not set
+# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
 # CONFIG_SETKEYCODES is not set
+# CONFIG_SETLOGCONS is not set
 
 #
 # Debian Utilities
@@ -235,7 +257,10 @@ CONFIG_MKTEMP=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 is not set
 
 #
@@ -243,29 +268,31 @@ CONFIG_MKTEMP=y
 #
 CONFIG_AWK=y
 CONFIG_FEATURE_AWK_MATH=y
+# CONFIG_ED is not set
 # CONFIG_PATCH is not set
 CONFIG_SED=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_VI=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
 # 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
+CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
 
 #
 # Finding Utilities
 #
-# CONFIG_FIND is not set
+CONFIG_FIND=y
+# 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_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
 # CONFIG_FEATURE_FIND_NEWER is not set
 # CONFIG_FEATURE_FIND_INUM is not set
 # CONFIG_FEATURE_FIND_EXEC is not set
@@ -283,12 +310,13 @@ CONFIG_FEATURE_GREP_FGREP_ALIAS=y
 # Init Utilities
 #
 # CONFIG_INIT is not set
+# CONFIG_DEBUG_INIT is not set
 # CONFIG_FEATURE_USE_INITTAB is not set
 # CONFIG_FEATURE_INIT_SCTTY is not set
 # CONFIG_FEATURE_EXTRA_QUIET is not set
 # CONFIG_FEATURE_INIT_COREDUMPS is not set
 # CONFIG_FEATURE_INITRD is not set
-# CONFIG_HALT is not set
+CONFIG_HALT=y
 # CONFIG_MESG is not set
 
 #
@@ -326,26 +354,30 @@ CONFIG_FEATURE_GREP_FGREP_ALIAS=y
 #
 # Linux Module Utilities
 #
-# CONFIG_INSMOD is not set
+CONFIG_INSMOD=y
 # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
 # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
 # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
 # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
 # CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
-# CONFIG_RMMOD is not set
-# CONFIG_LSMOD is not set
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
 # CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
 # CONFIG_MODPROBE is not set
 # CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS is not set
-# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
-# CONFIG_FEATURE_2_4_MODULES is not set
+
+#
+# Options common to multiple modutils
+#
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+CONFIG_FEATURE_2_4_MODULES=y
 # CONFIG_FEATURE_2_6_MODULES is not set
-# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
+CONFIG_FEATURE_QUERY_MODULE_INTERFACE=y
 
 #
 # Linux System Utilities
 #
-# CONFIG_DMESG is not set
+CONFIG_DMESG=y
 # CONFIG_FBSET is not set
 # CONFIG_FEATURE_FBSET_FANCY is not set
 # CONFIG_FEATURE_FBSET_READMODE is not set
@@ -366,14 +398,16 @@ CONFIG_FREERAMDISK=y
 # CONFIG_GETOPT is not set
 CONFIG_HEXDUMP=y
 # CONFIG_HWCLOCK is not set
-# CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set
+# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set
 # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
 # CONFIG_IPCRM is not set
 # CONFIG_IPCS is not set
 CONFIG_LOSETUP=y
 # CONFIG_MDEV is not set
 # CONFIG_FEATURE_MDEV_CONF is not set
-# CONFIG_MKSWAP is not set
+# CONFIG_FEATURE_MDEV_EXEC is not set
+CONFIG_MKSWAP=y
+# CONFIG_FEATURE_MKSWAP_V0 is not set
 CONFIG_MORE=y
 CONFIG_FEATURE_USE_TERMIOS=y
 CONFIG_MOUNT=y
@@ -382,7 +416,7 @@ CONFIG_PIVOT_ROOT=y
 # CONFIG_RDATE is not set
 # CONFIG_READPROFILE is not set
 # CONFIG_SETARCH is not set
-# CONFIG_SWAPONOFF is not set
+CONFIG_SWAPONOFF=y
 # CONFIG_SWITCH_ROOT is not set
 CONFIG_UMOUNT=y
 CONFIG_FEATURE_UMOUNT_ALL=y
@@ -399,6 +433,7 @@ CONFIG_FEATURE_MOUNT_LOOP=y
 # CONFIG_ADJTIMEX is not set
 # CONFIG_BBCONFIG is not set
 # CONFIG_CROND is not set
+# CONFIG_DEBUG_CROND_OPTION is not set
 # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
 # CONFIG_CRONTAB is not set
 # CONFIG_DC is not set
@@ -406,6 +441,7 @@ CONFIG_FEATURE_MOUNT_LOOP=y
 # CONFIG_DEVFSD_MODLOAD is not set
 # CONFIG_DEVFSD_FG_NP is not set
 # CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
 # CONFIG_EJECT is not set
 # CONFIG_LAST is not set
 # CONFIG_LESS is not set
@@ -430,6 +466,7 @@ CONFIG_FEATURE_MOUNT_LOOP=y
 # CONFIG_RX is not set
 CONFIG_STRINGS=y
 # CONFIG_SETSID is not set
+# CONFIG_TASKSET is not set
 # CONFIG_TIME is not set
 # CONFIG_WATCHDOG is not set
 
@@ -443,24 +480,25 @@ CONFIG_STRINGS=y
 # CONFIG_FAKEIDENTD is not set
 # CONFIG_FTPGET is not set
 # CONFIG_FTPPUT is not set
-# CONFIG_HOSTNAME is not set
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
+CONFIG_HOSTNAME=y
 # CONFIG_HTTPD is not set
-# CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY is not set
-# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
-# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set
 # CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
 # CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
 # CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
 # CONFIG_FEATURE_HTTPD_CGI is not set
 # CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
 # CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
 # CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
-# CONFIG_IFCONFIG is not set
-# CONFIG_FEATURE_IFCONFIG_STATUS is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
 # CONFIG_FEATURE_IFCONFIG_SLIP is not set
 # CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
-# CONFIG_FEATURE_IFCONFIG_HW is not set
-# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+CONFIG_FEATURE_IFCONFIG_HW=y
+CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
 # CONFIG_IFUPDOWN is not set
 # CONFIG_FEATURE_IFUPDOWN_IP is not set
 # CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
@@ -469,33 +507,35 @@ CONFIG_STRINGS=y
 # CONFIG_FEATURE_IFUPDOWN_IPX is not set
 # CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
 # CONFIG_INETD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_ECHO is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DISCARD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_TIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_DAYTIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BILTIN_CHARGEN is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
+# 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_FEATURE_IP_LINK is not set
 # CONFIG_FEATURE_IP_ROUTE is not set
 # CONFIG_FEATURE_IP_TUNNEL is not set
-# CONFIG_IPCALC is not set
-# CONFIG_FEATURE_IPCALC_FANCY is not set
+# CONFIG_FEATURE_IP_SHORT_FORMS is not set
 # CONFIG_IPADDR is not set
 # CONFIG_IPLINK is not set
 # CONFIG_IPROUTE is not set
 # CONFIG_IPTUNNEL is not set
+# CONFIG_IPCALC is not set
+# CONFIG_FEATURE_IPCALC_FANCY is not set
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
 # CONFIG_NAMEIF is not set
 CONFIG_NC=y
 # CONFIG_NC_GAPING_SECURITY_HOLE is not set
 # CONFIG_NETSTAT is not set
 # CONFIG_NSLOOKUP is not set
-# CONFIG_PING is not set
-# CONFIG_FEATURE_FANCY_PING is not set
+CONFIG_PING=y
+CONFIG_FEATURE_FANCY_PING=y
 # CONFIG_PING6 is not set
 # CONFIG_FEATURE_FANCY_PING6 is not set
-# CONFIG_ROUTE is not set
+CONFIG_ROUTE=y
 # CONFIG_TELNET is not set
 # CONFIG_FEATURE_TELNET_TTYPE is not set
 # CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
@@ -505,25 +545,26 @@ CONFIG_NC=y
 # CONFIG_FEATURE_TFTP_GET is not set
 # CONFIG_FEATURE_TFTP_PUT is not set
 # CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
-# CONFIG_FEATURE_TFTP_DEBUG is not set
+# CONFIG_DEBUG_TFTP is not set
 # CONFIG_TRACEROUTE is not set
 # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
 # CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
 # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
-# CONFIG_VCONFIG is not set
-CONFIG_WGET=y
-# CONFIG_FEATURE_WGET_STATUSBAR is not set
-# CONFIG_FEATURE_WGET_AUTHENTICATION is not set
-# CONFIG_FEATURE_WGET_IP6_LITERAL is not set
 
 #
 # udhcp Server/Client
 #
-# CONFIG_UDHCPD is not set
-# CONFIG_UDHCPC is not set
-# CONFIG_DUMPLEASES is not set
+# CONFIG_APP_UDHCPD is not set
+# CONFIG_APP_UDHCPC is not set
+# 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 is not set
+# CONFIG_FEATURE_WGET_AUTHENTICATION is not set
+# CONFIG_FEATURE_WGET_IP6_LITERAL is not set
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
 # CONFIG_ZCIP is not set
 
 #
@@ -531,12 +572,12 @@ CONFIG_WGET=y
 #
 CONFIG_FREE=y
 # CONFIG_FUSER is not set
-# CONFIG_KILL is not set
-# CONFIG_KILLALL is not set
-# CONFIG_PIDOF is not set
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+CONFIG_PIDOF=y
 # CONFIG_FEATURE_PIDOF_SINGLE is not set
 # CONFIG_FEATURE_PIDOF_OMIT is not set
-# CONFIG_PS is not set
+CONFIG_PS=y
 # CONFIG_FEATURE_PS_WIDE is not set
 # CONFIG_RENICE is not set
 # CONFIG_BB_SYSCTL is not set
@@ -547,47 +588,56 @@ CONFIG_FREE=y
 #
 # Shells
 #
-# CONFIG_FEATURE_SH_IS_ASH is not set
+CONFIG_FEATURE_SH_IS_ASH=y
 # CONFIG_FEATURE_SH_IS_HUSH is not set
 # CONFIG_FEATURE_SH_IS_LASH is not set
 # CONFIG_FEATURE_SH_IS_MSH is not set
-CONFIG_FEATURE_SH_IS_NONE=y
-# CONFIG_ASH is not set
-# CONFIG_ASH_JOB_CONTROL is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+CONFIG_ASH=y
+
+#
+# Ash Shell Options
+#
+CONFIG_ASH_JOB_CONTROL=y
 # CONFIG_ASH_READ_NCHARS is not set
 # CONFIG_ASH_READ_TIMEOUT is not set
 # CONFIG_ASH_ALIAS is not set
-# CONFIG_ASH_MATH_SUPPORT is not set
+CONFIG_ASH_MATH_SUPPORT=y
 # CONFIG_ASH_MATH_SUPPORT_64 is not set
 # CONFIG_ASH_GETOPTS is not set
-# CONFIG_ASH_CMDCMD is not set
 # CONFIG_ASH_BUILTIN_ECHO is not set
+# CONFIG_ASH_BUILTIN_TEST is not set
+# CONFIG_ASH_CMDCMD is not set
 # CONFIG_ASH_MAIL is not set
-# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 # CONFIG_ASH_RANDOM_SUPPORT is not set
 # CONFIG_ASH_EXPAND_PRMT is not set
 # CONFIG_HUSH is not set
 # CONFIG_LASH is not set
 # CONFIG_MSH is not set
+
+#
+# Bourne Shell Options
+#
 # CONFIG_FEATURE_SH_EXTRA_QUIET is not set
 # CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
-# CONFIG_FEATURE_COMMAND_EDITING is not set
+CONFIG_FEATURE_COMMAND_EDITING=y
 # CONFIG_FEATURE_COMMAND_EDITING_VI is not set
-CONFIG_FEATURE_COMMAND_HISTORY=0
+CONFIG_FEATURE_COMMAND_HISTORY=15
 # CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set
-# CONFIG_FEATURE_COMMAND_TAB_COMPLETION is not set
+CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
 # CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
 # CONFIG_FEATURE_SH_FANCY_PROMPT is not set
 
 #
 # System Logging Utilities
 #
-# CONFIG_SYSLOGD is not set
-# CONFIG_FEATURE_ROTATE_LOGFILE is not set
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
 # CONFIG_FEATURE_REMOTE_LOG is not set
 # CONFIG_FEATURE_IPC_SYSLOG is not set
 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
 # CONFIG_LOGREAD is not set
 # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
-# CONFIG_KLOGD is not set
+CONFIG_KLOGD=y
 # CONFIG_LOGGER is not set

diff --git a/packages/busybox/slingbox-1.2.2/halt.patch b/packages/busybox/slingbox-1.2.2/halt.patch
new file mode 100644 (file)
index 0000000..c52e35a
--- /dev/null
+++ b/packages/busybox/slingbox-1.2.2/halt.patch
@@ -0,0 +1,40 @@
+diff -Naur busybox-1.2.2/init.orig/halt.c busybox-1.2.2/init/halt.c
+--- busybox-1.2.2/init.orig/halt.c     2006-11-10 13:39:29.000000000 -0600
++++ busybox-1.2.2/init/halt.c  2006-11-10 13:39:09.000000000 -0600
+@@ -12,6 +12,8 @@
+ #include <sys/reboot.h>
+ #include <unistd.h>
+ 
++#include "init_shared.h"  /* Linksys mods */
++
+ int halt_main(int argc, char *argv[])
+ {
+       static const int magic[] = {
+@@ -40,6 +42,12 @@
+       if (flags&1) sleep(atoi(delay));
+       if (!(flags&2)) sync();
+ 
++/* Linksys Halt code - adapted from the Linksys source for Busybox. */
++      rc = bb_shutdown_system(magic[which]);
++      if (rc) bb_error_msg("No.");
++      return rc; /* Shrug */
++/* End of Linksys code */
++
+       /* Perform action. */
+       if (ENABLE_INIT && !(flags & 4)) {
+               if (ENABLE_FEATURE_INITRD) {
+diff -Naur busybox-1.2.2/init.orig/init_shared.c busybox-1.2.2/init/init_shared.c
+--- busybox-1.2.2/init.orig/init_shared.c      2006-11-10 13:39:29.000000000 -0600
++++ busybox-1.2.2/init/init_shared.c   2006-11-10 13:38:37.000000000 -0600
+@@ -62,6 +62,11 @@
+ 
+       sync();
+ 
++/* Linksys Halt code - if poweroff or halt, invoke an external program
++   to do actually turn off the power. */
++      if (magic != 0x01234567) system("/usr/bin/Set_Led power_off");
++/* End of Linksys Halt code */
++
+       reboot(magic);
+       return 0; /* Shrug */
+ }

diff --git a/packages/busybox/slingbox-1.2.2/wget-long-options.patch b/packages/busybox/slingbox-1.2.2/wget-long-options.patch
new file mode 100644 (file)
index 0000000..3c5920a
--- /dev/null
+++ b/packages/busybox/slingbox-1.2.2/wget-long-options.patch
@@ -0,0 +1,20 @@
+--- busybox-1.2.1.orig/networking/wget.c
++++ busybox-1.2.1/networking/wget.c
+@@ -136,7 +136,7 @@
+ #define WGET_OPT_PREFIX       32
+ #define WGET_OPT_PROXY        64
+ 
+-#if ENABLE_WGET_LONG_OPTIONS
++#if CONFIG_FEATURE_WGET_LONG_OPTIONS
+ static const struct option wget_long_options[] = {
+       { "continue",        0, NULL, 'c' },
+       { "quiet",           0, NULL, 'q' },
+@@ -180,7 +180,7 @@
+        * Crack command line.
+        */
+       bb_opt_complementally = "-1:\203::";
+-#if ENABLE_WGET_LONG_OPTIONS
++#if CONFIG_FEATURE_WGET_LONG_OPTIONS
+       bb_applet_long_options = wget_long_options;
+ #endif
+       opt = bb_getopt_ulflags(argc, argv, "cq\213O:\203:P:Y:",

diff --git a/packages/busybox/slingbox_1.2.2.bb b/packages/busybox/slingbox_1.2.2.bb
index a8fd77d..2468680 100644 (file)
--- a/packages/busybox/slingbox_1.2.2.bb
+++ b/packages/busybox/slingbox_1.2.2.bb
@@ -4,12 +4,14 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://defconfig \
+           file://wget-long-options.patch;patch=1 \
            file://lazy_umount.patch;patch=1 \
            file://slingbox_name.patch;patch=1 \
+           file://halt.patch;patch=1" \
            file://slingbox.patch;patch=1"
 
 S = "${WORKDIR}/busybox-${PV}"

diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb
index 1deab93..d585414 100644 (file)
--- a/packages/images/unslung-image.bb
+++ b/packages/images/unslung-image.bb
@@ -1,5 +1,5 @@
 LICENSE = MIT
-PR = "r22"
+PR = "r23"
 
 IMAGE_BASENAME = "unslung"
 
@@ -10,15 +10,17 @@ DEPENDS  = "virtual/kernel \
        ${UNSLUNG_EXTRA_DEPENDS}"
 
 RDEPENDS  = "kernel update-modules unslung-rootfs \
-       libc6-unslung slingbox ipkg libipkg \
-       cpio \
-       findutils \
+       libc6-unslung slingbox ipkg \
+       libipkg \
+#      cpio \
+#      findutils \
        ${UNSLUNG_EXTRA_RDEPENDS}"
 
 IPKG_INSTALL = "kernel update-modules unslung-rootfs \
-       libc6-unslung slingbox ipkg libipkg \
-       cpio \
-       findutils \
+       libc6-unslung slingbox ipkg \
+       libipkg \
+#      cpio \
+#      findutils \
        kernel-module-netconsole \
        ${UNSLUNG_EXTRA_INSTALL}"
 
@@ -72,25 +74,26 @@ unslung_clean_image () {
        ${STRIP} ${IMAGE_ROOTFS}/lib/libgcc_s.so.1
        chmod ugo+x ${IMAGE_ROOTFS}/lib/libgcc_s.so.1
 
+# MJW - experimental right now, but no longer need cpio and find
        # We need cpio and find, but we don't need any of the other stuff in
        # the packages (users can install the full package with ipkg after
        # unsling).  Remove the extra files and executables, and clean up
        # the entries from the ipkg database manually.
 
        #-- these are for cpio:
-       rm -f ${IMAGE_ROOTFS}/usr/bin/mt
-       rm -rf ${IMAGE_ROOTFS}/usr/libexec
-       rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/cpio.*
-       rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/alternatives/rmt
-       sed -i -e '/^Package: cpio/,/^$/d' ${IMAGE_ROOTFS}${libdir}/ipkg/status
+#      rm -f ${IMAGE_ROOTFS}/usr/bin/mt
+#      rm -rf ${IMAGE_ROOTFS}/usr/libexec
+#      rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/cpio.*
+#      rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/alternatives/rmt
+#      sed -i -e '/^Package: cpio/,/^$/d' ${IMAGE_ROOTFS}${libdir}/ipkg/status
 
        #-- and these for find:
-       rm -f ${IMAGE_ROOTFS}/usr/bin/locate
-       rm -f ${IMAGE_ROOTFS}/usr/bin/updatedb
-       rm -f ${IMAGE_ROOTFS}/usr/bin/xargs
-       rm -f ${IMAGE_ROOTFS}/usr/bin/xargs.findutils
-       rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/findutils.*
-       sed -i -e '/^Package: findutils/,/^$/d' ${IMAGE_ROOTFS}${libdir}/ipkg/status
+#      rm -f ${IMAGE_ROOTFS}/usr/bin/locate
+#      rm -f ${IMAGE_ROOTFS}/usr/bin/updatedb
+#      rm -f ${IMAGE_ROOTFS}/usr/bin/xargs
+#      rm -f ${IMAGE_ROOTFS}/usr/bin/xargs.findutils
+#      rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/findutils.*
+#      sed -i -e '/^Package: findutils/,/^$/d' ${IMAGE_ROOTFS}${libdir}/ipkg/status
 
        # FIXME: change made 24 Jul 2006 by the OE folks changes the "strip"
        # behavior to create an extra file named .debug/<filename> containing
@@ -107,6 +110,13 @@ unslung_clean_image () {
        rm -rf ${IMAGE_ROOTFS}/usr/bin/.debug
        rm -rf ${IMAGE_ROOTFS}/usr/sbin/.debug
        rm -rf ${IMAGE_ROOTFS}/usr/lib/.debug
+
+# MJW - Experimental - just to make space; remove before releasing!
+#      #### Hack to make space for testing!  REMOVE THIS!
+#      rm -rf ${IMAGE_ROOTFS}/etc/samba/codepages/unicode_map.850
+#      rm -rf ${IMAGE_ROOTFS}/bin/ftp
+#      #### End of Hack!
+
 }
 
 python () {

diff --git a/packages/nslu2-binary-only/unslung-rootfs/NOTES b/packages/nslu2-binary-only/unslung-rootfs/NOTES
index de4d8b0..34d319d 100644 (file)
--- a/packages/nslu2-binary-only/unslung-rootfs/NOTES
+++ b/packages/nslu2-binary-only/unslung-rootfs/NOTES
@@ -546,3 +546,10 @@ maintenance; easier than plugging and unplugging disks.
 
 Empty the /etc/win_share.info file on boot (fixes problem with multiple
 identical shares appearing on a system).
+
+Upgraded slingbox to v1.2.2 busybox base; enabled fdisk.
+
+Replaced Linksys busybox with slingbox entirely.
+
+Modified "unsling" script to use tar instead of find and cpio; removed
+obsolete and untested unsling utilities (eg: resling).

diff --git a/packages/nslu2-binary-only/unslung-rootfs/rc.1-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs/rc.1-diversion.patch
index 35015d6..d0d7699 100644 (file)
--- a/packages/nslu2-binary-only/unslung-rootfs/rc.1-diversion.patch
+++ b/packages/nslu2-binary-only/unslung-rootfs/rc.1-diversion.patch
@@ -13,7 +13,7 @@
  /bin/echo  "Starting Rest Task :"; . /etc/rc.d/rc.local
  
 +/bin/echo  "Starting Optware Packages:"; ( . /etc/rc.d/rc.optware-start )
-+
++/bin/echo  "Starting Bootdisk scripts:"; ( . /etc/rc.d/rc.bootdisk )
  /usr/bin/Set_Led ready
  /usr/bin/Set_Led beep1
  /bin/echo  "Checking disk status :"; /usr/sbin/CheckDiskFull 2 >/dev/null

diff --git a/packages/nslu2-binary-only/unslung-rootfs/rc.bootdisk b/packages/nslu2-binary-only/unslung-rootfs/rc.bootdisk
new file mode 100755 (executable)
index 0000000..3055c1a
--- /dev/null
+++ b/packages/nslu2-binary-only/unslung-rootfs/rc.bootdisk
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+# If we're not booting from flash, exit.
+i=`grep "/dev/root / jffs2" /proc/mounts`
+if ( [ -z "$i" ] ) ; then return 0 ; fi
+
+# Establish our identity
+linksys_hostname=`grep "^default_server_name=" /etc/CGI_ds.conf | sed s/default_server_name=//`
+real_hostname=`hostname`
+echo "====> linksys_hostname is $linksys_hostname"
+echo "====> real_hostname is $real_hostname"
+
+# but don't duplicate
+if ( [ "$linksys_hostname" = `hostname` ] ) ; then linksys_hostname= ; fi
+if ( [ "$real_hostname" = "unslung" ] ) ; then real_hostname= ; fi
+
+# Search all FAT/NTFS filesystem in order.
+# (heavily borrowed from the rc.start-optware script).
+for i in /share/*/data/HDD_* ; do
+  if ( [ "$i" = '/share/*/data/HDD_*' ] ) ; then break ; fi
+  echo "====> searching $i..."
+  for j in $linksys_hostname $real_hostname "unslung" ; do
+    echo "====> checking $i/bootdisk/$j ..."
+    if ( [ -d "$i"/bootdisk/"$j" ] ) ; then
+      for k in "$i"/bootdisk/"$j"/S??* ; do
+        echo "====> found $k ..."
+        [ ! -f "$k" ] && continue
+       nocopy=`grep "^#unslung-nocopy" "$k"`
+        if ( [ -z "$nocopy" ] ) ; then
+          echo "====> running copy: /tmp/tmpscript $k $i"
+          dos2unix -u <"$k" >/tmp/tmpscript
+          /bin/sh /tmp/tmpscript "$k" "$i"
+          rm -f   /tmp/tmpscript
+        else
+          echo "====> running in-place $k $k $i"
+          /bin/sh "$k" "$k" "$i"
+        fi
+      done
+    fi
+  done
+done

diff --git a/packages/nslu2-binary-only/unslung-rootfs/rc.lan-shell.patch b/packages/nslu2-binary-only/unslung-rootfs/rc.lan-shell.patch
new file mode 100644 (file)
index 0000000..5d25788
--- /dev/null
+++ b/packages/nslu2-binary-only/unslung-rootfs/rc.lan-shell.patch
@@ -0,0 +1,7 @@
+--- nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.lan.orig  2006-11-10 20:07:27.000000000 -0600
++++ nslu2-linksys-ramdisk-2.3r63/etc/rc.d/rc.lan       2006-11-10 20:07:35.000000000 -0600
+@@ -1,3 +1,3 @@
+-#!/bin/bash
++#!/bin/sh
+ #echo "set network driver to operate in auto-sense mode"
+ #/sbin/insmod /lib/modules/sk98lin.o

diff --git a/packages/nslu2-binary-only/unslung-rootfs/unsling b/packages/nslu2-binary-only/unslung-rootfs/unsling
index 400c7d0..79584df 100755 (executable)
--- a/packages/nslu2-binary-only/unslung-rootfs/unsling
+++ b/packages/nslu2-binary-only/unslung-rootfs/unsling
@@ -36,6 +36,9 @@ else
     exit 1
 fi
 
+# MJW - The new "tar" method of unslinging does not care if the device
+# has already been unslung.  The following test has been removed.
+#
 # Check that we can unsling at all!  An unsling operation creates a new
 # rootfs, but it also marks the flash rootfs (with a flag file such as
 # ".sda1root") so that subsequent boots do not create the "var.state"
@@ -45,39 +48,39 @@ fi
 # making sure that we are in a state in which we are capable of
 # performing the unsling operation.
 
-echo "Checking if able to unsling..."
-echo
-m1="/dev/root /dev.state jffs2 rw 0 0"
-m2="/dev/root /var.state jffs2 rw 0 0"
-if ! grep "$m1" /proc/mounts >/dev/null 2>&1 || ! grep "$m2" /proc/mounts >/dev/null 2>&1 ; then
-    echo "Error: This system is unable to properly unsling because certain"
-    echo "required mounts (dev.state and/or var.state) are not available."
-    echo "This is most probably because you have already unslung this system."
-    echo
-
-    if   [ -f /.sda1root ] ; then
-       rm -f /.sda1root
-    elif [ -f /.sdb1root ] ; then
-       rm -f /.sdb1root
-    elif [ -f /.sda2root ] ; then
-       rm -f /.sda2root
-    elif [ -f /.sdb2root ] ; then
-       rm -f /.sdb2root
-    else
-       echo "However, in this case, the flags that indicate an already-unslung"
-       echo "system seem to be missing.  Try restarting your NSLU2 to correct,"
-       echo "but if the problem persists, try re-flashing your NSLU2."
-       exit 1
-    fi
-    echo "The flags that indicate an already-unslung system have now been"
-    echo "removed and the required mounts should now become present after"
-    echo "reboot of the NSLU2."
-    echo
-    echo "1) Please unplug all drives from the NSLU2,"
-    echo "2) reboot,"
-    echo "3) and retry the unslinging process."
-    exit 1
-fi
+#echo "Checking if able to unsling..."
+#echo
+#m1="/dev/root /dev.state jffs2 rw 0 0"
+#m2="/dev/root /var.state jffs2 rw 0 0"
+#if ! grep "$m1" /proc/mounts >/dev/null 2>&1 || ! grep "$m2" /proc/mounts >/dev/null 2>&1 ; then
+#    echo "Error: This system is unable to properly unsling because certain"
+#    echo "required mounts (dev.state and/or var.state) are not available."
+#    echo "This is most probably because you have already unslung this system."
+#    echo
+#
+#    if   [ -f /.sda1root ] ; then
+#      rm -f /.sda1root
+#    elif [ -f /.sdb1root ] ; then
+#      rm -f /.sdb1root
+#    elif [ -f /.sda2root ] ; then
+#      rm -f /.sda2root
+#    elif [ -f /.sdb2root ] ; then
+#      rm -f /.sdb2root
+#    else
+#      echo "However, in this case, the flags that indicate an already-unslung"
+#      echo "system seem to be missing.  Try restarting your NSLU2 to correct,"
+#      echo "but if the problem persists, try re-flashing your NSLU2."
+#      exit 1
+#    fi
+#    echo "The flags that indicate an already-unslung system have now been"
+#    echo "removed and the required mounts should now become present after"
+#    echo "reboot of the NSLU2."
+#    echo
+#    echo "1) Please unplug all drives from the NSLU2,"
+#    echo "2) reboot,"
+#    echo "3) and retry the unslinging process."
+#    exit 1
+#fi
 
 # Check it's a real mount point
 
@@ -138,8 +141,16 @@ if [ "$nopw" -eq 0 ] ; then
        echo "Error setting password."
        exit 1
    fi
+# Quick sanity check, something may have gone wrong while we were
+# waiting at the passwd prompt...
+   if ! [ -d $targ/public ] || ! [ -f $targconf/.dongle ] || ! [ -f $targconf/passwd ] ; then
+       echo
+       echo "Error: $targ appears to have vanished into thin air."
+       echo "This would indicate some type of problem with the USB cable,"
+       echo "the device, or the formatting of the device."
+       exit 1
+   fi
    cp /etc/passwd /usr/local/passwd
-#   cp /etc/passwd $targconf/passwd
    grep "^root:" /etc/passwd >$targconf/passwd.new
    grep -v "^root:" $targconf/passwd >>$targconf/passwd.new
    mv $targconf/passwd $targconf/passwd.save
@@ -161,10 +172,28 @@ fi
 # Copy the complete rootfs to the target.
 
 echo
-echo "Copying the complete rootfs from / to $targ ..."
-/usr/bin/find / -xdev -print | /usr/bin/cpio -p -d -m -u $targ
-rm -rf $targ/dev ; mv $targ/dev.state $targ/dev
-rm -rf $targ/var ; mv $targ/var.state $targ/var
+echo "Copying the complete rootfs from / to $targ ... "
+echo " (this will take just a couple of minutes)"
+# Quick sanity check to avoid filling the flash...
+if ! [ -d $targ/public ] || ! [ -f $targconf/.dongle ] || ! [ -f $targconf/passwd ] ; then
+    echo
+    echo "Error: $targ appears to have vanished into thin air."
+    echo "This would indicate some type of problem with the USB cable,"
+    echo "the device, or the formatting of the device."
+    exit 1
+fi
+# /usr/bin/find / -xdev -print | /usr/bin/cpio -p -d -m -u $targ
+# rm -rf $targ/dev ; mv $targ/dev.state $targ/dev
+# rm -rf $targ/var ; mv $targ/var.state $targ/var
+echo "./var/tmp"    > /tmp/xfile
+echo "./dev.state" >> /tmp/xfile
+echo "./var.state" >> /tmp/xfile
+mkdir -p /tmp/tmprootfs
+/bin/mount /dev/mtdblock4 /tmp/tmprootfs
+/bin/tar -c -C /tmp/tmprootfs -X /tmp/xfile -f - . | (cd $targ; /bin/tar -x -f -)
+/bin/umount /tmp/tmprootfs
+echo "Copy complete ..."
+echo
 
 # Copy over the existing ipkg database.
 
@@ -191,6 +220,8 @@ touch $targ/var/log/wtmp
 chmod 644 $targ/var/log/wtmp
 touch $targ/var/run/utmp
 chmod 644 $targ/var/run/utmp
+mkdir -p $targ/var/tmp
+chmod 777 $targ/var/tmp
 
 # The "user password" Linksys utility is hard-coded to /share/hdd; also the
 # QuickSet utility seems to have some difficulty as well.  Ugly fix is to
@@ -227,7 +258,8 @@ echo > $targ/$flag
 echo
 echo "Unsling complete."
 echo
-echo "Leave the device $htmlinfo plugged in, and reboot"
-echo "in order to boot this system up into unslung mode."
+echo "Leave the device $htmlinfo, plugged in and reboot (using"
+echo "either the Web GUI, or the command \"DO_Reboot\") in order to boot"
+echo "this system up into unslung mode."
 
 exit 0

diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
index 73089ba..290d2de 100644 (file)
--- a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
+++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
@@ -1,6 +1,6 @@
 SECTION = "base"
 
-PR = "r15"
+PR = "r16"
 
 DEPENDS = "nslu2-linksys-libs nslu2-linksys-sambacodepages"
 
@@ -11,11 +11,12 @@ SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2 \
           file://motd-fl \
           file://motd-un \
           file://unsling \
-          file://resling \
-          file://slingover \
+#         file://resling \
+#         file://slingover \
           file://linuxrc \
           file://unslung.gif \
           file://nsswitch.conf \
+          file://rc.bootdisk \
           file://rc.optware-start \
           file://rc.optware-stop \
           file://rc-diversion.patch;patch=1 \
@@ -23,6 +24,7 @@ SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r63-2.tar.bz2 \
           file://rc.1-timestamp.patch;patch=1 \
           file://rc.crond-diversion.patch;patch=1 \
           file://rc.halt-diversion.patch;patch=1 \
+          file://rc.lan-shell.patch;patch=1 \
           file://rc.local-diversion.patch;patch=1 \
           file://rc.modules-diversion.patch;patch=1 \
           file://rc.network-diversion.patch;patch=1 \
@@ -104,10 +106,11 @@ do_compile () {
        install -d ${S}/initrd
 
        install -m 755 ${WORKDIR}/unsling ${S}/sbin/unsling
-       install -m 755 ${WORKDIR}/resling ${S}/sbin/resling
-       install -m 755 ${WORKDIR}/slingover ${S}/sbin/slingover
+#      install -m 755 ${WORKDIR}/resling ${S}/sbin/resling
+#      install -m 755 ${WORKDIR}/slingover ${S}/sbin/slingover
        install -m 755 ${WORKDIR}/rc.optware-start ${S}/etc/rc.d/rc.optware-start
        install -m 755 ${WORKDIR}/rc.optware-stop ${S}/etc/rc.d/rc.optware-stop
+       install -m 755 ${WORKDIR}/rc.bootdisk ${S}/etc/rc.d/rc.bootdisk
 
        install -m 644 ${WORKDIR}/nsswitch.conf ${S}/etc/nsswitch.conf
 
@@ -161,6 +164,14 @@ do_compile () {
        # a link to busybox or slingbox at some point.
        rm -r ${S}/usr/sbin/date
        ln -s ../../bin/date ${S}/usr/sbin/date
+
+       # Replace the Linksys-provided /bin/busybox with a link to slingbox.
+       rm -f ${S}/bin/busybox
+       ln -s slingbox ${S}/bin/busybox
+
+       # No reason not to have a home directory for root...
+       mkdir -p ${S}/root
+       chmod 775 ${S}/root
 }
 
 do_install () {