tazlito rev 473

typo in build loram
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Dec 25 13:03:49 2017 +0100 (18 months ago)
parents 4bae445cd0bf
children 7a846c7d75cd
files tazlito
line diff
     1.1 --- a/tazlito	Mon Dec 04 10:43:30 2017 +0100
     1.2 +++ b/tazlito	Mon Dec 25 13:03:49 2017 +0100
     1.3 @@ -915,7 +915,7 @@
     1.4  		[ -f /lib/modules/$version/kernel/fs/$aufs/$aufs.ko.?z ] && break
     1.5  		install_package $aufs $version && break
     1.6  	done || return 1
     1.7 -	[ -s /init ] || install_package slitaz-boot-files
     1.8 +	[ -s /init ] || install_package slitaz-boot-scripts
     1.9  	cp /init $TMP_DIR/initfs/
    1.10  	# bootfloppybox will need floppy.ko.?z, /dev/fd0, /dev/tty0
    1.11  	cp /lib/modules/$version/kernel/drivers/block/floppy.ko.?z \
    1.12 @@ -1156,7 +1156,7 @@
    1.13  		deduplicate
    1.14  		cd - > /dev/null
    1.15  		rootfs=$TMP_DIR/$(basename $i)
    1.16 -		/usr/sbin/mksquashfs $TMP_DIR/fs $rootfs -comp xz -Xbcj x86
    1.17 +		/usr/sbin/mksquashfs $TMP_DIR/fs $rootfs -comp ${1:-xz -Xbcj x86}
    1.18  		cd $TMP_DIR
    1.19  		rootfs_sizes="$rootfs_sizes $(( $(du -s $TMP_DIR/fs | cut -f1) - $(du -s $rootfs | cut -f1) ))"
    1.20  		( cd $(dirname $rootfs); echo $(basename $rootfs) | cpio -o -H newc ) > $rootfs.cpio
    1.21 @@ -1270,7 +1270,7 @@
    1.22  
    1.23  build_loram_ram() {
    1.24  	build_initfs ram || return 1
    1.25 -	build_loram_rootfs
    1.26 +	build_loram_rootfs    "$1"
    1.27  	cp -a $TMP_DIR/iso    $TMP_DIR/loramiso
    1.28  	make_bzImage_hardlink $TMP_DIR/loramiso/boot
    1.29  	mv $TMP_DIR/initfs.gz $TMP_DIR/loramiso/boot/rootfs.gz
    1.30 @@ -2874,7 +2874,7 @@
    1.31  		case "$4" in
    1.32  			cdrom)		build_loram_cdrom ;;
    1.33  			http)		build_loram_http ;;
    1.34 -			*)			build_loram_ram ;;
    1.35 +			*)		build_loram_ram "$5" ;;
    1.36  		esac
    1.37  		umount $TMP_DIR/iso	# no -d: needs /proc
    1.38  		losetup -d $loopdev