projects
/
openwrt
/
svn-archive
/
archive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not use deprecated path to functions.sh (/etc/functions.sh -> /lib/functions.sh)
[openwrt/svn-archive/archive.git]
/
target
/
linux
/
rb532
/
base-files
/
sbin
/
cf2nand
diff --git
a/target/linux/rb532/base-files/sbin/cf2nand
b/target/linux/rb532/base-files/sbin/cf2nand
index 5b838dbbb97ed8735622e2269d0aa98ca603474b..0bfc259ef630d6af3664836244b66638e927232c 100755
(executable)
--- a/
target/linux/rb532/base-files/sbin/cf2nand
+++ b/
target/linux/rb532/base-files/sbin/cf2nand
@@
-1,5
+1,5
@@
#!/bin/sh
#!/bin/sh
-. /
etc
/functions.sh
+. /
lib
/functions.sh
copy_kernel() {
local input="$1"
copy_kernel() {
local input="$1"
@@
-45,7
+45,7
@@
mount -t yaffs2 "$boot" /tmp/cf2nand/p1
mount -t yaffs2 "$main" /tmp/cf2nand/p2
echo "Copying kernel..."
mount -t yaffs2 "$main" /tmp/cf2nand/p2
echo "Copying kernel..."
-copy_kernel /dev/cfa1 /tmp/cf2nand/p1/kernel "root=/dev/mtdblock1 rootfstype=yaffs2
init=/etc/preinit
" 2>/dev/null >/dev/null
+copy_kernel /dev/cfa1 /tmp/cf2nand/p1/kernel "root=/dev/mtdblock1 rootfstype=yaffs2 " 2>/dev/null >/dev/null
umount /tmp/cf2nand/p1
rmdir /tmp/cf2nand/p1
umount /tmp/cf2nand/p1
rmdir /tmp/cf2nand/p1
@@
-55,7
+55,7
@@
echo "chmod ugo+x /" > /tmp/cf2nand/p2/etc/uci-defaults/set_root_permission
sync
# Use kexec is present
[ -x /usr/bin/kexec ] && {
sync
# Use kexec is present
[ -x /usr/bin/kexec ] && {
- kexec -l /tmp/cf2nand/p1/kernel --command-line="$(cat /proc/cmdline) root=/dev/mtdblock1 rootfstype=yaffs2
init=/etc/preinit
"
+ kexec -l /tmp/cf2nand/p1/kernel --command-line="$(cat /proc/cmdline) root=/dev/mtdblock1 rootfstype=yaffs2"
kexec -e
}
umount /tmp/cf2nand/p2
kexec -e
}
umount /tmp/cf2nand/p2