tazinst rev 108

tazinst: fix kernel name (32 bits + 5in1 case)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Oct 31 16:21:10 2020 +0000 (2020-10-31)
parents 26b2bbcfb6ec
children 356702403bc7
files tazinst
line diff
     1.1 --- a/tazinst	Fri Sep 18 15:28:34 2020 +0000
     1.2 +++ b/tazinst	Sat Oct 31 16:21:10 2020 +0000
     1.3 @@ -1827,12 +1827,9 @@
     1.4  # kernel is renamed to standard vmlinuz-$VERSION.
     1.5  install_kernel()
     1.6  {
     1.7 -	if [ -d /$TARGET_ROOT/lib/modules ]; then
     1.8 -		KERNEL="vmlinuz-$(ls /$TARGET_ROOT/lib/modules | tail -1)"
     1.9 -	else
    1.10 -		KERNEL="vmlinuz-$(uname -r)"
    1.11 +	KERNEL="vmlinuz-$(uname -r)"
    1.12 +	[ -d /$TARGET_ROOT/lib/modules/$(uname -r) ] ||
    1.13  		log "$(_ 'Kernel name not found, falling back to: %s' "$(uname -r)")"
    1.14 -	fi
    1.15  	mkdir -p $TARGET_ROOT/boot || error8
    1.16  	for i in $SOURCE_ROOT/boot/bzImage* ; do
    1.17  		cp $i $TARGET_ROOT/boot/${KERNEL%slitaz*}slitaz${i#*bzImage}
    1.18 @@ -1904,7 +1901,7 @@
    1.19  		  cat "$i" ) 2>>"$LOG" | /bin/busybox cpio -idu
    1.20  	done 2>>"$LOG" > /dev/null
    1.21  	fi
    1.22 -	cp /etc/keymap.conf /etc/locale.conf /etc/TZ /etc/network.conf etc
    1.23 +	install -m 644 /etc/keymap.conf /etc/locale.conf /etc/TZ /etc/network.conf etc
    1.24  	# unpack /usr (double check...)
    1.25  	if ls etc/tazlito | grep -q ".extract"; then
    1.26  		for i in etc/tazlito/*.extract; do