projects
/
openwrt
/
staging
/
yousong.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c9f2df5
)
Allow routerboard users to kexec into the newly installed kernel if kexec-tools is...
author
Florian Fainelli
<florian@openwrt.org>
Tue, 12 Aug 2008 06:02:06 +0000
(06:02 +0000)
committer
Florian Fainelli
<florian@openwrt.org>
Tue, 12 Aug 2008 06:02:06 +0000
(06:02 +0000)
SVN-Revision: 12286
target/linux/adm5120/router_le/base-files/sbin/wget2nand
patch
|
blob
|
history
target/linux/adm5120/router_le/config-2.6.26
patch
|
blob
|
history
target/linux/rb532/base-files/sbin/cf2nand
patch
|
blob
|
history
target/linux/rb532/base-files/sbin/wget2nand
patch
|
blob
|
history
target/linux/rb532/config-2.6.23
patch
|
blob
|
history
diff --git
a/target/linux/adm5120/router_le/base-files/sbin/wget2nand
b/target/linux/adm5120/router_le/base-files/sbin/wget2nand
index 50e9ddb4fb18ce3b69bcbb70aae8530c6cf20c49..20be45826b59a005b9b2df09413b216e30db5297 100755
(executable)
--- a/
target/linux/adm5120/router_le/base-files/sbin/wget2nand
+++ b/
target/linux/adm5120/router_le/base-files/sbin/wget2nand
@@
-63,6
+63,11
@@
echo "chmod ugo+x /" > /tmp/wget2nand-rootfs/etc/uci-defaults/set_root_permissio
sync
ls /tmp/wget2nand-kernel/
ls /tmp/wget2nand-rootfs/
sync
ls /tmp/wget2nand-kernel/
ls /tmp/wget2nand-rootfs/
+# use kexec if present
+[ -x /usr/sbin/kexec ] && {
+ kexec -l /tmp/wget2nand-kernel/kernel --command-line="$(cat /proc/cmdline) rootfstype=yaffs2 root=$mtd_kernel"
+ kexec -e
+}
# unmount the partitions and remove the directories into which they were mounted
umount /tmp/wget2nand-kernel
umount /tmp/wget2nand-rootfs
# unmount the partitions and remove the directories into which they were mounted
umount /tmp/wget2nand-kernel
umount /tmp/wget2nand-rootfs
diff --git
a/target/linux/adm5120/router_le/config-2.6.26
b/target/linux/adm5120/router_le/config-2.6.26
index 622d74186936ebf4e48559f39251cda9b88e8ebe..4792f6445e9512ed3ec6998c561a5d995e9b5319 100644
(file)
--- a/
target/linux/adm5120/router_le/config-2.6.26
+++ b/
target/linux/adm5120/router_le/config-2.6.26
@@
-143,6
+143,7
@@
CONFIG_IP_NF_TARGET_CLUSTERIP=m
CONFIG_IRQ_CPU=y
# CONFIG_IWLWIFI_LEDS is not set
# CONFIG_JOLIET is not set
CONFIG_IRQ_CPU=y
# CONFIG_IWLWIFI_LEDS is not set
# CONFIG_JOLIET is not set
+CONFIG_KEXEC=y
# CONFIG_LEDS_ALIX is not set
CONFIG_LEDS_GPIO=m
CONFIG_LEDS_TRIGGER_ADM5120_SWITCH=m
# CONFIG_LEDS_ALIX is not set
CONFIG_LEDS_GPIO=m
CONFIG_LEDS_TRIGGER_ADM5120_SWITCH=m
diff --git
a/target/linux/rb532/base-files/sbin/cf2nand
b/target/linux/rb532/base-files/sbin/cf2nand
index 146aa4f112b40a110dcf9f16ca562133b6f97def..5b838dbbb97ed8735622e2269d0aa98ca603474b 100755
(executable)
--- a/
target/linux/rb532/base-files/sbin/cf2nand
+++ b/
target/linux/rb532/base-files/sbin/cf2nand
@@
-53,6
+53,11
@@
echo "Copying filesystem..."
( cd /tmp/cf2nand/rootfs; tar c . ) | ( cd /tmp/cf2nand/p2; tar x )
echo "chmod ugo+x /" > /tmp/cf2nand/p2/etc/uci-defaults/set_root_permission
sync
( cd /tmp/cf2nand/rootfs; tar c . ) | ( cd /tmp/cf2nand/p2; tar x )
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 -e
+}
umount /tmp/cf2nand/p2
rmdir /tmp/cf2nand/p2
umount /tmp/cf2nand/p2
rmdir /tmp/cf2nand/p2
diff --git
a/target/linux/rb532/base-files/sbin/wget2nand
b/target/linux/rb532/base-files/sbin/wget2nand
index 2101195bca29bb661bdd14f6e9165c94b25e2233..b0f4205e78ba594481b0aaa1cca6adf43fa065c8 100755
(executable)
--- a/
target/linux/rb532/base-files/sbin/wget2nand
+++ b/
target/linux/rb532/base-files/sbin/wget2nand
@@
-55,6
+55,12
@@
echo "chmod ugo+x /" > /tmp/wget2nand/etc/uci-defaults/set_root_permission
sync
ls /tmp/wget2nand-boot/
ls /tmp/wget2nand/
sync
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 -e
+}
+
# unmount the partitions and remove the directories into which they were mounted
umount /tmp/wget2nand-boot
umount /tmp/wget2nand
# unmount the partitions and remove the directories into which they were mounted
umount /tmp/wget2nand-boot
umount /tmp/wget2nand
diff --git
a/target/linux/rb532/config-2.6.23
b/target/linux/rb532/config-2.6.23
index fcfd6103ae0166e2e7200ca69a46da438753e79a..53c151753008527a095c8bd4d6d4cf4bc7e009dc 100644
(file)
--- a/
target/linux/rb532/config-2.6.23
+++ b/
target/linux/rb532/config-2.6.23
@@
-60,6
+60,7
@@
CONFIG_INITRAMFS_SOURCE=""
CONFIG_INPUT=y
CONFIG_INPUT_KEYBOARD=y
CONFIG_IRQ_CPU=y
CONFIG_INPUT=y
CONFIG_INPUT_KEYBOARD=y
CONFIG_IRQ_CPU=y
+CONFIG_KEXEC=y
# CONFIG_KEYBOARD_ATKBD is not set
CONFIG_KEYBOARD_GPIO=y
# CONFIG_KEYBOARD_LKKBD is not set
# CONFIG_KEYBOARD_ATKBD is not set
CONFIG_KEYBOARD_GPIO=y
# CONFIG_KEYBOARD_LKKBD is not set