diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2016-10-25 10:27:17 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2016-10-25 10:27:17 +0200 |
| commit | 714a6eb1eb55f00abe4ae3d84f851fae699df57d (patch) | |
| tree | 53d713458959e3d3c34dd9eda7484b725387dd24 | |
| parent | be9c33dae7fb8751dc11278eff14999e194ee1db (diff) | |
update kreboot
| -rw-r--r-- | package/kexec-tools/Makefile | 2 | ||||
| -rwxr-xr-x | package/kexec-tools/files/kreboot | 38 |
2 files changed, 34 insertions, 6 deletions
diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile index 6ec02732f..3804c00c7 100644 --- a/package/kexec-tools/Makefile +++ b/package/kexec-tools/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= kexec-tools PKG_VERSION:= 2.0.11 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_HASH:= b1097986ffdb928cf41a94e8a5dfddc981a8fa710cccf13298e7f8dd939a2ee3 PKG_DESCR:= kernel exec tools PKG_SECTION:= sys/misc diff --git a/package/kexec-tools/files/kreboot b/package/kexec-tools/files/kreboot index 9b22ffeea..1a32e18cf 100755 --- a/package/kexec-tools/files/kreboot +++ b/package/kexec-tools/files/kreboot @@ -1,9 +1,39 @@ #!/bin/sh +ARCH=$(uname -m) KERNEL="/mnt/boot/kernel" -KEXEC_ARG=" -l --atags " +KEXEC_ARGS="-l" +if [ $ARCH = "arm" ]; then + KEXEC_ARGS="$KEXEC_ARGS --atags" +fi PART_A=2 PART_B=3 +me=$0 + +usage() { +cat >&2 <<EOF +Syntax: $me [-k kernel] + + -k give the path to the kernel eg. /boot/vmlinuz-4.7.4 + (default: $KERNEL) +EOF + exit $1 +} + +while getopts "k:" ch; do + case $ch { + (k) + # if default does not fit, give the actual keren via -k otion eg "-k /boot/vmlinuz-4.7.4 + KERNEL="$OPTARG" + ;; + + (*) + usage 1 + ;; + } +done +shift $((OPTIND - 1)) + load_kernel(){ # get the Bootargs and replace the current Partition with @@ -12,7 +42,7 @@ load_kernel(){ # echo "kexec $KEXEC_ARG --append=\"$BOOT_ARGS\" $KERNEL" # set -x # Load the new kernel, unmount the partition and exec the new kernel - kexec -l --atags --append=\""$BOOT_ARGS"\" $KERNEL + kexec $KEXEC_ARGS --append=\""$BOOT_ARGS"\" $KERNEL umount /mnt kexec -e } @@ -24,9 +54,8 @@ umount /mnt 2> /dev/null PART="/dev/$(readlink /dev/root)" # extract the partition number C_M_PART_NUM=$(readlink /dev/root | grep -o -e '[[:digit:]]*$') -#$(readlink /dev/root | grep -o '.$') -#Cut off the Partition Number +# cut off the Partition Number C_M_PART=$(readlink /dev/root | sed "s/$C_M_PART_NUM\$//") CURRENT_PART="/dev/${C_M_PART}${C_M_PART_NUM}" @@ -46,4 +75,3 @@ case $C_M_PART_NUM in echo "FAILURE" ;; esac - |