diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-12-02 13:09:15 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-12-02 13:09:15 +0100 |
| commit | c651ec19a22b05ed54e4524a4cc2bf5d8a694a9f (patch) | |
| tree | f1a397c5933cf2995eb62ec8ddd5cc976bb39ffc | |
| parent | 8e5f8306aeccb873918bf078722a07cd5594cc60 (diff) | |
| parent | 3cabd6a4603ce0837d70a625b7ec9fb07cd72afe (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
| -rw-r--r-- | packages/initrdscripts/files/87-kexecboot.sh | 4 | ||||
| -rw-r--r-- | packages/initrdscripts/initramfs-module-kexecboot_1.0.bb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/initrdscripts/files/87-kexecboot.sh b/packages/initrdscripts/files/87-kexecboot.sh index 2a51b4d9c8..0d2f040a83 100644 --- a/packages/initrdscripts/files/87-kexecboot.sh +++ b/packages/initrdscripts/files/87-kexecboot.sh @@ -11,9 +11,9 @@ if [ -n "$BOOT_ROOT" -a -f "$BOOT_ROOT/boot/zImage" ]; then ls -l "$BOOT_ROOT/boot/initramfs.bin" initramfs="--initrd=$BOOT_ROOT/boot/initramfs.bin" fi - echo /usr/sbin/kexec -f "$BOOT_ROOT/boot/zImage" $initramfs --command-line="$CMDLINE nokexec" >$CONSOLE + echo /usr/sbin/kexec $initramfs --command-line="$CMDLINE nokexec" -f "$BOOT_ROOT/boot/zImage" >$CONSOLE sleep 10 - /usr/sbin/kexec -f "$BOOT_ROOT/boot/zImage" $initramfs --command-line="$CMDLINE nokexec" + /usr/sbin/kexec $initramfs --command-line="$CMDLINE nokexec" -f "$BOOT_ROOT/boot/zImage" sleep 10000 fi fi diff --git a/packages/initrdscripts/initramfs-module-kexecboot_1.0.bb b/packages/initrdscripts/initramfs-module-kexecboot_1.0.bb index face73038a..3080269920 100644 --- a/packages/initrdscripts/initramfs-module-kexecboot_1.0.bb +++ b/packages/initrdscripts/initramfs-module-kexecboot_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://87-kexecboot.sh" -PR = "r1" +PR = "r2" DESCRIPTION = "An initramfs module for kexecing kernel from rootfs." RDEPENDS = "initramfs-uniboot kexec-static" |