SliTaz Repositories

     1.1 --- a/cook	Sun Feb 04 20:42:31 2018 +0000
     1.2 +++ b/cook	Wed Feb 21 12:55:19 2018 +0200
     1.3 @@ -1239,20 +1239,21 @@
     1.4  	grep -q ^AUFS_NOT_SUPPORTED $receipt && return
     1.5  	grep -q ^AUFS_NOT_RAMFS $receipt && base="/mnt/aufsmnt$$"
     1.6  	[ -n "$AUFS_MOUNTS" -a ! -f /aufs-umount.sh ] || return
     1.7 -	grep -q ^aufs /proc/modules || modprobe aufs 2> /dev/null || return
     1.8 +	grep -q ^aufs /proc/modules || modprobe aufs 2>/dev/null || return
     1.9  	mkdir ${base}root ${base}rw || return
    1.10  
    1.11  	_ 'Setup aufs chroot...'
    1.12  
    1.13  	# Sanity check
    1.14 -	for i in / /proc /sys /dev/shm /home ; do
    1.15 +	for i in / /proc /sys /dev /dev/shm /home; do
    1.16  		case " $AUFS_MOUNTS " in
    1.17 -		*\ $i\ *) ;;
    1.18 -		*)	AUFS_MOUNTS="$AUFS_MOUNTS $i" ;;
    1.19 +			*\ $i\ *) ;;
    1.20 +			*)	AUFS_MOUNTS="$AUFS_MOUNTS $i" ;;
    1.21  		esac
    1.22  	done
    1.23  	for mnt in $(ls -d $AUFS_MOUNTS | sort | uniq); do
    1.24 -		mount --bind $mnt ${base}root$mnt
    1.25 +		mkdir -p           ${base}root$mnt	# for `mount -o bind`
    1.26 +		mount -o bind $mnt ${base}root$mnt	# use `-o bind` instead of `--bind`
    1.27  		if [ $mnt == / ] && ! mount -t aufs -o br=${base}rw:/ none ${base}root; then
    1.28  			_ 'Aufs mount failure'
    1.29  			umount ${base}root
    1.30 @@ -1463,6 +1464,7 @@
    1.31  					/\/fonts\.scale$/d; /\/fonts\.dir$/d;
    1.32  					/\/share\/appdata\//d; /\/share\/help\//d;
    1.33  					/\/share\/icons\/hicolor\/[12356][1245][268]*x[12356][1245][268]*\//d;	# 22, 24, 32, 64, 128, 256, 512
    1.34 +					/\.so\.dbg$/d;
    1.35  					' $filelist
    1.36  				;;
    1.37  			@dev)
    1.38 @@ -1470,6 +1472,7 @@
    1.39  				sed -n '/\.h$/p; /\.hxx$/p; /\.a$/p; /\.la$/p; /\.pc$/p; /\.pri$/p; /bin\/.*-config$/p;
    1.40  					/\.m4$/p; /\.gir$/p; /\.typelib$/p; /\.vapi$/p; /\.deps$/p; /\.cmake$/p;
    1.41  					/\/Makefile.*/p; /\.inc$/p; /\/include\//p;
    1.42 +					/\.so\.dbg$/p;
    1.43  					' $filelist
    1.44  				;;
    1.45  			@rm)