summaryrefslogtreecommitdiffstats
path: root/target/linux/rb532/base-files/sbin
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-05-14 10:20:53 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-05-14 10:20:53 +0000
commiteac1cfc4ba154abfb89ea561030fdce14a0cdca0 (patch)
tree0589c0ee59913f1c0790d02030b654601bf7a6a5 /target/linux/rb532/base-files/sbin
parent070fb549fa0803ffd8af62c4228b48da545dad07 (diff)
make kernels use /etc/preinit by default
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15840 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/rb532/base-files/sbin')
-rwxr-xr-xtarget/linux/rb532/base-files/sbin/cf2nand4
-rwxr-xr-xtarget/linux/rb532/base-files/sbin/wget2nand2
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/rb532/base-files/sbin/cf2nand b/target/linux/rb532/base-files/sbin/cf2nand
index 5b838dbbb..60542de1e 100755
--- a/target/linux/rb532/base-files/sbin/cf2nand
+++ b/target/linux/rb532/base-files/sbin/cf2nand
@@ -45,7 +45,7 @@ mount -t yaffs2 "$boot" /tmp/cf2nand/p1
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
@@ -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 ] && {
- 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
diff --git a/target/linux/rb532/base-files/sbin/wget2nand b/target/linux/rb532/base-files/sbin/wget2nand
index b0f4205e7..57f412864 100755
--- a/target/linux/rb532/base-files/sbin/wget2nand
+++ b/target/linux/rb532/base-files/sbin/wget2nand
@@ -57,7 +57,7 @@ ls /tmp/wget2nand-boot/
ls /tmp/wget2nand/
# use kexec if present
[ -x /usr/bin/kexec ] && {
- kexec -l /tmp/wget2nand-boot/kernel --command-line="$(cat /proc/cmdline) root=$main rootfstype=yaffs2 init=/etc/preinit"
+ kexec -l /tmp/wget2nand-boot/kernel --command-line="$(cat /proc/cmdline) root=$main rootfstype=yaffs2"
kexec -e
}