Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded

into home.(none):/home/slug/openembedded

2004/12/26 11:16:53+10:30 (none)!rwhitby
Unslung 3.15-alpha, with an improved switchbox, and confirmation dialogs for maintenance mode

BKrev: 41ce0a17xiLVTaQgH7jrrEudgkOddw

2 files changed, 23 insertions, 24 deletions

diff --git a/packages/busybox/switchbox-1.00/defconfig b/packages/busybox/switchbox-1.00/defconfig
index a757d731cd..d2587d30ce 100644
--- a/packages/busybox/switchbox-1.00/defconfig
+++ b/packages/busybox/switchbox-1.00/defconfig
@@ -95,19 +95,19 @@ CONFIG_MD5SUM=y
 CONFIG_MKDIR=y
 # CONFIG_MKFIFO is not set
 # CONFIG_MKNOD is not set
-# CONFIG_MV is not set
+CONFIG_MV=y
 # CONFIG_OD is not set
 # CONFIG_PRINTF is not set
-# CONFIG_PWD is not set
+CONFIG_PWD=y
 # CONFIG_REALPATH is not set
 CONFIG_RM=y
-# CONFIG_RMDIR is not set
+CONFIG_RMDIR=y
 # CONFIG_SEQ is not set
 # CONFIG_SHA1SUM is not set
 CONFIG_SLEEP=y
 # CONFIG_SORT is not set
 # CONFIG_STTY is not set
-# CONFIG_SYNC is not set
+CONFIG_SYNC=y
 # CONFIG_TAIL is not set
 # CONFIG_TEE is not set
 CONFIG_TEST=y
@@ -168,7 +168,7 @@ CONFIG_FEATURE_VI_YANKMARK=y
 # Finding Utilities
 #
 # CONFIG_FIND is not set
-# CONFIG_GREP is not set
+CONFIG_GREP=y
 # CONFIG_XARGS is not set
 
 #
@@ -224,7 +224,7 @@ CONFIG_FEATURE_2_4_MODULES=y
 CONFIG_FEATURE_2_6_MODULES=y
 # CONFIG_LSMOD is not set
 # CONFIG_MODPROBE is not set
-# CONFIG_RMMOD is not set
+CONFIG_RMMOD=y
 
 #
 # Networking Utilities
@@ -270,10 +270,11 @@ CONFIG_FEATURE_WGET_STATUSBAR=y
 #
 # Process Utilities
 #
-# CONFIG_FREE is not set
-# CONFIG_KILL is not set
+CONFIG_FREE=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
 # CONFIG_PIDOF is not set
-# CONFIG_PS is not set
+CONFIG_PS=y
 # CONFIG_RENICE is not set
 # CONFIG_TOP is not set
 # CONFIG_UPTIME is not set
@@ -328,7 +329,7 @@ CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
 # CONFIG_FDFORMAT is not set
 # CONFIG_FDISK is not set
 # FDISK_SUPPORT_LARGE_DISKS is not set
-# CONFIG_FREERAMDISK is not set
+CONFIG_FREERAMDISK=y
 # CONFIG_FSCK_MINIX is not set
 # CONFIG_MKFS_MINIX is not set
 # CONFIG_GETOPT is not set
diff --git a/packages/busybox/switchbox-1.00/linuxrc b/packages/busybox/switchbox-1.00/linuxrc
index 6361636b67..82e8c1139b 100644
--- a/packages/busybox/switchbox-1.00/linuxrc
+++ b/packages/busybox/switchbox-1.00/linuxrc
@@ -11,30 +11,28 @@ if [ -z "$mounted" ] && /bin/mount -rt jffs2 /dev/mtdblock4 /mnt/tmpmnt ; then
 	if [ -f /mnt/tmpmnt/.recovery ] ; then
 	    mounted=
 	elif [ -f /mnt/tmpmnt/.ramdisk ] ; then
-	    /bin/dd if=/dev/zero of=/dev/ram1 bs=1k count=10k
+	    /bin/dd if=/dev/zero of=/dev/ram1 bs=1k count=12k
 	    /bin/mkdir /lib
 	    /bin/ln -s /mnt/tmpmnt/lib/* /lib
 	    /bin/mkdir /usr/bin
 	    /bin/ln -s /mnt/tmpmnt/usr/bin/mke2fs /usr/bin
 	    /bin/ln -s /mnt/tmpmnt/usr/bin/find /usr/bin
 	    /bin/ln -s /mnt/tmpmnt/usr/bin/cpio /usr/bin
-	    /usr/bin/mke2fs -m 0 /dev/ram1 10240
-	    /bin/mkdir /mnt/tmpmnt2
-	    /bin/mount -t ext2 /dev/ram1 /mnt/tmpmnt2
-	    ( cd /mnt/tmpmnt ; /usr/bin/find . -print0 -mount | /usr/bin/cpio -p -0 -d -m -u /mnt/tmpmnt2 )
-	    /bin/cp /mnt/tmpmnt2/home/httpd/html/Management/upgrade.cgi /mnt/tmpmnt2/home/httpd/html/Management/upgrade-real.cgi
-	    /bin/echo "#!/bin/sh" > /mnt/tmpmnt2/home/httpd/html/Management/upgrade.cgi
-	    /bin/echo >> /mnt/tmpmnt2/home/httpd/html/Management/upgrade.cgi
+	    /usr/bin/mke2fs -m 0 /dev/ram1 12288
+	    /bin/mount -t ext2 /dev/ram1 /mnt/repair
+	    ( cd /mnt/tmpmnt ; /usr/bin/find . -print0 -mount | /usr/bin/cpio -p -0 -d -m -u /mnt/repair )
+	    /bin/cp /mnt/repair/home/httpd/html/Management/upgrade.cgi /mnt/repair/home/httpd/html/Management/upgrade-real.cgi
+	    /bin/echo "#!/bin/sh" > /mnt/repair/home/httpd/html/Management/upgrade.cgi
+	    /bin/echo >> /mnt/repair/home/httpd/html/Management/upgrade.cgi
 	    /bin/echo "/bin/mount -t ramfs none /upload -o size=8196 2>/dev/null" \
-		>> /mnt/tmpmnt2/home/httpd/html/Management/upgrade.cgi
+		>> /mnt/repair/home/httpd/html/Management/upgrade.cgi
 	    /bin/echo "/bin/dd if=/dev/zero of=/upload/free-ram bs=1k count=8k 2>/dev/null" \
-		>> /mnt/tmpmnt2/home/httpd/html/Management/upgrade.cgi
+		>> /mnt/repair/home/httpd/html/Management/upgrade.cgi
 	    /bin/echo "/bin/umount /upload 2>/dev/null" \
-		>> /mnt/tmpmnt2/home/httpd/html/Management/upgrade.cgi
+		>> /mnt/repair/home/httpd/html/Management/upgrade.cgi
 	    /bin/echo "exec /home/httpd/html/Management/upgrade-real.cgi" \
-		>> /mnt/tmpmnt2/home/httpd/html/Management/upgrade.cgi
-	    /bin/umount /mnt/tmpmnt2
-	    /bin/rm -rf /mnt/tmpmnt2
+		>> /mnt/repair/home/httpd/html/Management/upgrade.cgi
+	    /bin/umount /mnt/repair
 	    /bin/echo "Root filesystem will be mounted from /dev/ram1 (a copy of /dev/mtdblock4) ..."
 	    /bin/echo "0x0101" > /proc/sys/kernel/real-root-dev
 	    mounted=/mnt/tmpmnt