aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2008-08-12 06:02:06 +0000
committerFlorian Fainelli <florian@openwrt.org>2008-08-12 06:02:06 +0000
commit8dc883b9769f0b8733cee949a1c2959c4542168c (patch)
tree16ad8818c89da4ea0225ec4b9d679a3e9da2dc71 /target/linux/adm5120
parentc9f2df5cea731976a7766dda5d1a4a64d9bba8ea (diff)
downloadupstream-8dc883b9769f0b8733cee949a1c2959c4542168c.tar.gz
upstream-8dc883b9769f0b8733cee949a1c2959c4542168c.tar.bz2
upstream-8dc883b9769f0b8733cee949a1c2959c4542168c.zip
Allow routerboard users to kexec into the newly installed kernel if kexec-tools is installed
SVN-Revision: 12286
Diffstat (limited to 'target/linux/adm5120')
-rwxr-xr-xtarget/linux/adm5120/router_le/base-files/sbin/wget2nand5
-rw-r--r--target/linux/adm5120/router_le/config-2.6.261
2 files changed, 6 insertions, 0 deletions
diff --git a/target/linux/adm5120/router_le/base-files/sbin/wget2nand b/target/linux/adm5120/router_le/base-files/sbin/wget2nand
index 50e9ddb4fb..20be45826b 100755
--- 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/
+# 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
diff --git a/target/linux/adm5120/router_le/config-2.6.26 b/target/linux/adm5120/router_le/config-2.6.26
index 622d741869..4792f6445e 100644
--- 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_KEXEC=y
# CONFIG_LEDS_ALIX is not set
CONFIG_LEDS_GPIO=m
CONFIG_LEDS_TRIGGER_ADM5120_SWITCH=m