tazlito rev 407
tazlito build-loram: fix aufs install
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun Dec 06 20:03:52 2015 +0100 (2015-12-06) |
parents | 1bfe19fbb289 |
children | 2db3711ea1b0 |
files | tazlito |
line diff
1.1 --- a/tazlito Sun Nov 29 12:59:59 2015 +0100 1.2 +++ b/tazlito Sun Dec 06 20:03:52 2015 +0100 1.3 @@ -809,7 +809,7 @@ 1.4 ln -s . $TMP_DIR/initfs/usr 1.5 for aufs in aufs overlayfs ; do 1.6 [ ! -f /lib/modules/$version/kernel/fs/$aufs/$aufs.ko.?z ] && 1.7 - install_package $fs $version && break 1.8 + install_package $aufs $version && break 1.9 done || return 1 1.10 cp /init $TMP_DIR/initfs/ 1.11 # bootfloppybox will need floppy.ko.?z, /dev/fd0, /dev/tty0 1.12 @@ -2704,7 +2704,7 @@ 1.13 fi 1.14 mkdir -p $TMP_DIR/iso 1.15 mount -o loop,ro -t iso9660 $ISO $TMP_DIR/iso 1.16 - loopdev=$( (losetup -a 2>/dev/null || losetup) | grep $ISO | cut -d: -f1) 1.17 + loopdev=$( (losetup -a 2>/dev/null || losetup) | sed "/$ISO/!d;s/:.*//;q") 1.18 if ! check_iso_for_loram ; then 1.19 echo "$2 is not a valid SliTaz live CD. Abort." 1.20 umount -d $TMP_DIR/iso