diff options
| author | Rod Whitby <rod@whitby.id.au> | 2005-03-31 10:23:18 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2005-03-31 10:23:18 +0000 |
| commit | e76c74494e359ecc8b93cb8aec6875d990eb3980 (patch) | |
| tree | 0958a5070884446e366bd50b80a6479ffa846853 | |
| parent | ad50b0674f6db015354de3eb26f406678c25b8a4 (diff) | |
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/bitbake/openembedded
2005/03/31 19:52:55+09:30 (none)!rwhitby
Unslung 4.9-alpha: unsling updated to give feedback on the rootfs transfer.
BKrev: 424bcf96TIwiETAoTEjapR6mCSH5GA
| -rw-r--r-- | packages/nslu2-binary-only/unslung-rootfs-2.3r25/unsling | 38 | ||||
| -rw-r--r-- | packages/nslu2-binary-only/unslung-rootfs_2.3r25.bb | 4 |
2 files changed, 18 insertions, 24 deletions
diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/unsling b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/unsling index c640630bba..120143d352 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/unsling +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/unsling @@ -1,8 +1,8 @@ #!/bin/sh -usage="Usage: $0 [flash|hdd|flash-data|hdd-data|jffs2-flash|jffs2-hdd|jffs2-flash-data|jffs2-hdd-data]" +usage="Usage: $0 [hdd-data|flash-data|hdd-conf|flash-conf|jffs2-hdd-data|jffs2-flash-data|jffs2-hdd-conf|jffs2-flash-conf]" -# Set or seach for target disk +# Set target disk if [ $# -gt 1 ] ; then echo $usage @@ -13,25 +13,29 @@ if [ $# -eq 1 ] ; then if [ "$1" = "flash-data" ] ; then targ=/share/flash/data copy=true + flag=.sdb1root elif [ "$1" = "hdd-data" ] ; then targ=/share/hdd/data copy=true - elif [ "$1" = "flash" ] ; then + flag=.sda1root + elif [ "$1" = "flash-conf" ] ; then targ=/share/flash/conf copy=true - elif [ "$1" = "hdd" ] ; then + flag=.sdb2root + elif [ "$1" = "hdd-conf" ] ; then targ=/share/hdd/conf copy=true + flag=.sda2root elif [ "$1" = "jffs2-flash-data" ] ; then targ=/share/flash/data copy= elif [ "$1" = "jffs2-hdd-data" ] ; then targ=/share/hdd/data copy= - elif [ "$1" = "jffs2-flash" ] ; then + elif [ "$1" = "jffs2-flash-conf" ] ; then targ=/share/flash/conf copy= - elif [ "$1" = "jffs2-hdd" ] ; then + elif [ "$1" = "jffs2-hdd-conf" ] ; then targ=/share/hdd/conf copy= else @@ -103,26 +107,16 @@ else # Copy the complete rootfs to the target. + echo "Copying the complete rootfs from / to $targ." /usr/bin/find / -print0 -mount | /usr/bin/cpio -p -0 -d -m -u $targ rm -rf $targ/dev ; mv $targ/dev.state $targ/dev rm -rf $targ/var ; mv $targ/var.state $targ/var - rm -f /.sda1root /.sda2root /.sdb1root /.sdb2root - rm -f $targ/.sda1root $targ/.sda2root $targ/.sdb1root $targ/.sdb2root - - if [ "$targ" = "/share/hdd/data" ] ; then - echo > /.sda1root - echo > $targ/.sda1root - elif [ "$targ" = "/share/hdd/conf" ] ; then - echo > /.sda2root - echo > $targ/.sda2root - elif [ "$targ" = "/share/flash/data" ] ; then - echo > /.sdb1root - echo > $targ/.sdb1root - elif [ "$targ" = "/share/flash/conf" ] ; then - echo > /.sdb2root - echo > $targ/.sdb2root - fi + rm -f /.sd??root $targ/.sd??root + + echo "Creating /$flag to direct switchbox to boot from $targ." + echo > /$flag + echo > $targ/$flag fi diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r25.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r25.bb index 1d76228d87..a7528c52d1 100644 --- a/packages/nslu2-binary-only/unslung-rootfs_2.3r25.bb +++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r25.bb @@ -1,8 +1,8 @@ SECTION = "base" -PR = "r48" +PR = "r49" -UNSLUNG_VERSION = "4.7-alpha" +UNSLUNG_VERSION = "4.8-alpha" DEPENDS = "nslu2-linksys-libs" |