diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2009-05-14 10:20:53 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2009-05-14 10:20:53 +0000 |
| commit | a9c958c2de59e0747b5dcf82f5fd5b1aaf956c3b (patch) | |
| tree | da0c6a06eb4d50def39e6a0fb3bdd3ac813b74fe /target/linux/rb532 | |
| parent | b0d4d23bc644dde146070ce692872884dc28a799 (diff) | |
| download | upstream-a9c958c2de59e0747b5dcf82f5fd5b1aaf956c3b.tar.gz upstream-a9c958c2de59e0747b5dcf82f5fd5b1aaf956c3b.tar.bz2 upstream-a9c958c2de59e0747b5dcf82f5fd5b1aaf956c3b.zip | |
make kernels use /etc/preinit by default
SVN-Revision: 15840
Diffstat (limited to 'target/linux/rb532')
| -rwxr-xr-x | target/linux/rb532/base-files/sbin/cf2nand | 4 | ||||
| -rwxr-xr-x | target/linux/rb532/base-files/sbin/wget2nand | 2 | ||||
| -rw-r--r-- | target/linux/rb532/image/Makefile | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/rb532/base-files/sbin/cf2nand b/target/linux/rb532/base-files/sbin/cf2nand index 5b838dbbb9..60542de1e1 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 b0f4205e78..57f4128642 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 } diff --git a/target/linux/rb532/image/Makefile b/target/linux/rb532/image/Makefile index 9d0857dec8..9f1ec23057 100644 --- a/target/linux/rb532/image/Makefile +++ b/target/linux/rb532/image/Makefile @@ -34,23 +34,23 @@ define Image/BuildKernel endef define Image/cmdline/jffs2-64k -block2mtd.block2mtd=/dev/sda2,65536 root=/dev/mtdblock0 rootfstype=jffs2 init=/etc/preinit +block2mtd.block2mtd=/dev/sda2,65536 root=/dev/mtdblock0 rootfstype=jffs2 endef define Image/cmdline/jffs2-128k -block2mtd.block2mtd=/dev/sda2,131072 root=/dev/mtdblock0 rootfstype=jffs2 init=/etc/preinit +block2mtd.block2mtd=/dev/sda2,131072 root=/dev/mtdblock0 rootfstype=jffs2 endef define Image/cmdline/ext2 -root=/dev/sda2 rootfstype=ext2 init=/etc/preinit +root=/dev/sda2 rootfstype=ext2 endef define Image/cmdline/squashfs -block2mtd.block2mtd=/dev/sda2,65536 root=/dev/mtdblock0 rootfstype=squashfs init=/etc/preinit +block2mtd.block2mtd=/dev/sda2,65536 root=/dev/mtdblock0 rootfstype=squashfs endef define Image/cmdline/yaffs2 -root=/dev/mtdblock1 rootfstype=yaffs2 init=/etc/preinit +root=/dev/mtdblock1 rootfstype=yaffs2 endef define Image/Build |