Rather than replacing the versionless vmlinux and System.map files, copy to files with the version info appended.
Additionally, since executing the script is a last resort option, inform the user about the missing `installkernel` command and the location of the installation. This work is adapted from `arch/s390/boot/install.sh`. Signed-off-by: Nick Child <nnac...@linux.ibm.com> --- Hoping I am not breaking someones dependency on targeting /boot/vmlinux so RFC'ing. I typically have kernelinstall on my LPARs and installing and rebooting goes peacefully. Recently, I did not have kernelinstall and `make install` seemed to behave differently. I got very little output but a succeful return code. After initramfs issues during boot I dug into the makefiles a bit to figure out where execution was differing. When `kernelinstall` cannot be found, we invoke `arch/powerpc/boot/install.sh` instead. I am primarily interested in getting more information relayed to the user about what is going on. The changes to installing with the version appended are more of an afterthought that makes sense to me but could understand why someone may depend on consistent filenames. Opening as RFC for opinions/rejections/concerns. Thanks! arch/powerpc/boot/install.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/boot/install.sh b/arch/powerpc/boot/install.sh index 461902c8a46d..101fcb397a0f 100755 --- a/arch/powerpc/boot/install.sh +++ b/arch/powerpc/boot/install.sh @@ -21,13 +21,17 @@ set -e # this should work for both the pSeries zImage and the iSeries vmlinux.sm image_name=`basename $2` -if [ -f $4/$image_name ]; then - mv $4/$image_name $4/$image_name.old + +echo "Warning: '${INSTALLKERNEL}' command not available... Copying" \ + "directly to $4/$image_name-$1" >&2 + +if [ -f $4/$image_name-$1 ]; then + mv $4/$image_name-$1 $4/$image_name-$1.old fi -if [ -f $4/System.map ]; then - mv $4/System.map $4/System.old +if [ -f $4/System.map-$1 ]; then + mv $4/System.map-$1 $4/System-$1.old fi -cat $2 > $4/$image_name -cp $3 $4/System.map +cat $2 > $4/$image_name-$1 +cp $3 $4/System.map-$1 -- 2.31.1