e2k, stage2: replace e2k fix for install kernel in ISO to stage2 feature

features.in/e2k/scripts.d/20-e2k-boot

@@ -4,10 +4,6 @@ echo "** 20-e2k-boot START"
 
 cd "$WORKDIR"
 
-# Rename kernel image, unable to boot kernel from CD/DVD
-# if its name does not contain "." (mcst#6856).
-mv boot/image{,.0}
-
 # slightly different logic as there's no boot *menu*:
 # ensure the user can install this if possible
 [ -f live    ] && default=live

features.in/stage2/stage1/scripts.d/95-copy-kernel

@@ -6,9 +6,13 @@ mkdir -p boot
 case "`arch`" in
 	e2k)
 		kname=image
+		# Rename kernel image, unable to boot kernel from CD/DVD
+		# if its name does not contain "." (mcst#6856).
+		ksuffix=.0
 		;;
 	*)
 		kname=vmlinuz
+		ksuffix=
 		;;
 esac
 
@@ -21,7 +25,7 @@ kimage="$(find /boot -type f -name "$kname-*")"
 initrd="$(find /boot -type f -name 'initrd-*.img')"
 
 cp $verbose -af $kimage boot/
-mv boot/$kname-$kverdef boot/$kname
+mv boot/$kname-$kverdef boot/$kname$ksuffix
 cp $verbose -af $initrd boot/
 mv boot/initrd-$kverdef.img boot/initrd.img