diff options
| author | Florian Fainelli <florian@openwrt.org> | 2008-08-12 06:02:06 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2008-08-12 06:02:06 +0000 |
| commit | 4bb28c3f0f812d3fc1f0b154a19f55cdf589efbd (patch) | |
| tree | 078fc26afbf49b3760a931e21d5e5a058d044a20 /target/linux/adm5120/router_le | |
| parent | 64253085802ac645950fee49829332c406f5088b (diff) | |
| download | upstream-4bb28c3f0f812d3fc1f0b154a19f55cdf589efbd.tar.gz upstream-4bb28c3f0f812d3fc1f0b154a19f55cdf589efbd.tar.bz2 upstream-4bb28c3f0f812d3fc1f0b154a19f55cdf589efbd.zip | |
Allow routerboard users to kexec into the newly installed kernel if kexec-tools is installed
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12286 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120/router_le')
| -rwxr-xr-x | target/linux/adm5120/router_le/base-files/sbin/wget2nand | 5 | ||||
| -rw-r--r-- | target/linux/adm5120/router_le/config-2.6.26 | 1 |
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 |