# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1604161270 0
# Node ID 292c3fdb9769cfa7e56d3d6498594d648f129a0e
# Parent  26b2bbcfb6ec4a456b2192266bbd5e15ec168d16
tazinst: fix kernel name (32 bits + 5in1 case)

diff -r 26b2bbcfb6ec -r 292c3fdb9769 tazinst
--- a/tazinst	Fri Sep 18 15:28:34 2020 +0000
+++ b/tazinst	Sat Oct 31 16:21:10 2020 +0000
@@ -1827,12 +1827,9 @@
 # kernel is renamed to standard vmlinuz-$VERSION.
 install_kernel()
 {
-	if [ -d /$TARGET_ROOT/lib/modules ]; then
-		KERNEL="vmlinuz-$(ls /$TARGET_ROOT/lib/modules | tail -1)"
-	else
-		KERNEL="vmlinuz-$(uname -r)"
+	KERNEL="vmlinuz-$(uname -r)"
+	[ -d /$TARGET_ROOT/lib/modules/$(uname -r) ] ||
 		log "$(_ 'Kernel name not found, falling back to: %s' "$(uname -r)")"
-	fi
 	mkdir -p $TARGET_ROOT/boot || error8
 	for i in $SOURCE_ROOT/boot/bzImage* ; do
 		cp $i $TARGET_ROOT/boot/${KERNEL%slitaz*}slitaz${i#*bzImage}
@@ -1904,7 +1901,7 @@
 		  cat "$i" ) 2>>"$LOG" | /bin/busybox cpio -idu
 	done 2>>"$LOG" > /dev/null
 	fi
-	cp /etc/keymap.conf /etc/locale.conf /etc/TZ /etc/network.conf etc
+	install -m 644 /etc/keymap.conf /etc/locale.conf /etc/TZ /etc/network.conf etc
 	# unpack /usr (double check...)
 	if ls etc/tazlito | grep -q ".extract"; then
 		for i in etc/tazlito/*.extract; do