tazlito rev 472

rootfs.gz may be pathless with build-loram
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Dec 04 10:43:30 2017 +0100 (21 months ago)
parents 06272ab64896
children 61761275673e
files tazlito
line diff
     1.1 --- a/tazlito	Wed Nov 29 23:33:43 2017 +0100
     1.2 +++ b/tazlito	Mon Dec 04 10:43:30 2017 +0100
     1.3 @@ -1183,7 +1183,7 @@
     1.4  		sed -i '/ifmem/{NNNNNNNNd};/^LABEL/{N;/LABEL SliTaz [^L]/{NNNd}}' \
     1.5  			$root/boot/isolinux/isolinux.cfg
     1.6  		[ -n "$3" ] || set -- $(grep 'append [0-9]' $root/boot/isolinux/common.cfg)
     1.7 -		sed -i "s/label $3\$/label slitaz/;s|=\(.*\)/rootfs\(.*\).gz |=\1/rootfs.gz |" \
     1.8 +		sed -i "s/label $3\$/label slitaz/;s|=\(.*rootfs\)\(.*\)\.gz |=\1.gz |" \
     1.9  			$root/boot/isolinux/*.cfg
    1.10  	fi
    1.11  }
    1.12 @@ -1258,7 +1258,7 @@
    1.13  		done
    1.14  		sed -i -e "/append [0-9]/s/append .*/append$new $1/" -e \
    1.15  			"/append ifmem [0-9]/s/append .*/append ifmem$new $1/" $cfg
    1.16 -		sed -i 's|\(initrd=\)\(.[^/]*/\)\(rootfs\)|\1\2rootfs.gz,\2\3|' $cfg
    1.17 +		sed -i 's|\(initrd=\)\([^r]*\)\(rootfs\)|\1\2rootfs.gz,\2\3|' $cfg
    1.18  		sed -i '/LABEL base/{NNNNp;s|base .ive|cdrom|;s|base|cdrom|;s|,[^ ]*||}' $cfg
    1.19  		sed -i '/LABEL cdrom/{NNNNp;s|z cdrom|& text|;s|L cdrom|&text|;s|root=|screen=text &|;s|,[^ ]*||}' $cfg
    1.20  	done