diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2006-12-06 18:31:28 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2006-12-06 18:31:28 +0000 |
| commit | decda6f17f46f8828ea38d16a49717d2a77910e7 (patch) | |
| tree | 90a4c4a25d820e450f23fec4bc08441ffc1ae871 /target/linux/rb532-2.6/base-files | |
| parent | ede0d279ad9d5bf0cdb696000baa75e3faaec02a (diff) | |
| download | upstream-decda6f17f46f8828ea38d16a49717d2a77910e7.tar.gz upstream-decda6f17f46f8828ea38d16a49717d2a77910e7.tar.bz2 upstream-decda6f17f46f8828ea38d16a49717d2a77910e7.zip | |
replace the ugly rb532 cmdline hack with a cleaner one that does not depend on magic offsets
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5699 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/rb532-2.6/base-files')
| -rwxr-xr-x | target/linux/rb532-2.6/base-files/sbin/cf2nand | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/rb532-2.6/base-files/sbin/cf2nand b/target/linux/rb532-2.6/base-files/sbin/cf2nand index f8576beaa4..3f3352fd1b 100755 --- a/target/linux/rb532-2.6/base-files/sbin/cf2nand +++ b/target/linux/rb532-2.6/base-files/sbin/cf2nand @@ -6,13 +6,8 @@ copy_kernel() { local output="$2" local cmdline="$3" size="$(echo -n "$cmdline" | wc -c)" - dd if="$input" bs=3M count=1 | ( - dd bs=4112 count=1 - echo -n "$cmdline" - dd if=/dev/zero bs="$((512 - $size))" count=1 - dd bs=512 count=1 of=/dev/null - cat - ) > "$output" + dd if="$input" bs=3M count=1 > "$output" + /sbin/patch-cmdline "$output" "$cmdline" } fstype="$(mount | grep ' / ' | awk '{print $5}')" |