diff options
| author | Rod Whitby <rod@whitby.id.au> | 2005-02-21 13:03:11 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2005-02-21 13:03:11 +0000 |
| commit | 1676fca2c487892c5839fb933a06c008d0fa4fdd (patch) | |
| tree | a8a26b6b54f83f78b15717513d09b50a3a581512 /packages/busybox/switchbox-1.00 | |
| parent | eb9b124493b7c5e05fd494e2105af4b45dd7036c (diff) | |
Unslung and OpenSlug both working with switchbox. Updated CVSDATE stuff in nslu2.conf. Changed CMDLINE in openslug kernel to use switchbox. Changed switchbox and slingbox to use /usr/sbin and /usr/bin (just like in OpenSlug busybox) so that the location of executables match across SwitchBox, Unslung and Openslug. Added /initrd directory to OpenSlug rootfs so that it can be used for the pivot_root in switchbox.
BKrev: 4219dc0fM9IKay9jW_b1WMSP_N7e1w
Diffstat (limited to 'packages/busybox/switchbox-1.00')
| -rw-r--r-- | packages/busybox/switchbox-1.00/defconfig | 2 | ||||
| -rw-r--r-- | packages/busybox/switchbox-1.00/linuxrc | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/packages/busybox/switchbox-1.00/defconfig b/packages/busybox/switchbox-1.00/defconfig index 40f6b415e5..ad94247847 100644 --- a/packages/busybox/switchbox-1.00/defconfig +++ b/packages/busybox/switchbox-1.00/defconfig @@ -31,7 +31,7 @@ EXTRA_CFLAGS_OPTIONS="" # # Installation Options # -CONFIG_INSTALL_NO_USR=y +# CONFIG_INSTALL_NO_USR is not set PREFIX="/" # diff --git a/packages/busybox/switchbox-1.00/linuxrc b/packages/busybox/switchbox-1.00/linuxrc index 90e365158d..da500300c3 100644 --- a/packages/busybox/switchbox-1.00/linuxrc +++ b/packages/busybox/switchbox-1.00/linuxrc @@ -7,14 +7,14 @@ prefroot= /bin/mount -t proc proc /proc /bin/echo "0x0100" > /proc/sys/kernel/real-root-dev -sysconflen=`/bin/dd if=/dev/mtd1 bs=4 count=1 2>/dev/null | hexdump -n 6 -e '"%02d"'` +sysconflen=`/bin/dd if=/dev/mtd1 bs=4 count=1 2>/dev/null | /usr/bin/hexdump -n 6 -e '"%02d"'` ipaddr=`/bin/dd if=/dev/mtd1 bs=1 count=$sysconflen skip=4 2>/dev/null | grep ip_addr | sed -e s/ip_addr=//` netmask=`/bin/dd if=/dev/mtd1 bs=1 count=$sysconflen skip=4 2>/dev/null | grep netmask | sed -e s/netmask=//` gateway=`/bin/dd if=/dev/mtd1 bs=1 count=$sysconflen skip=4 2>/dev/null | grep gateway | sed -e s/gateway=//` nfsrootloc=`/bin/dd if=/dev/mtd1 bs=1 count=$sysconflen skip=4 2>/dev/null | grep nfsroot | sed -e s/nfsroot=// | cut -d, -f 1` nfsrootopts=`/bin/dd if=/dev/mtd1 bs=1 count=$sysconflen skip=4 2>/dev/null | grep nfsroot | sed -e s/nfsroot=// | cut -d, -f 2- | sed -e s/\"//g` device=/dev/`/bin/sed -n -e 's/^\(mtd[0-9]*\): .* "FIS directory"/\1/p' /proc/mtd` -length=`/bin/dd if=$device bs=2 skip=2048 2>/dev/null | /bin/hexdump -n 4 -e '4/1 "%02X"' $device` +length=`/bin/dd if=$device bs=2 skip=2048 2>/dev/null | /usr/bin/hexdump -n 4 -e '4/1 "%02X"' $device` # Determine desired rootfs if [ -z "$mounted" ] && /bin/mount -rt jffs2 /dev/mtdblock4 /mnt/jffs2 ; then @@ -144,7 +144,7 @@ fi # Pivot if [ -n "$mounted" ] ; then if [ $prefroot = "nfsroot" ] ; then - /bin/killall portmap + /usr/bin/killall portmap fi if [ $mounted != "/mnt/jffs2" ] ; then sleep 1 @@ -162,7 +162,7 @@ if [ -n "$mounted" ] ; then runboot=/bin/sh fi /sbin/pivot_root . initrd - exec chroot . $runboot < dev/console > dev/console 2>&1 + exec /usr/sbin/chroot . $runboot < dev/console > dev/console 2>&1 fi #if [ -z "$mounted" ] ; then |