SliTaz Repositories

1 --- a/cook

2 +++ b/cook

3 @@ -1021,7 +1021,7 @@

4 tac ${1}rw/aufs-umount.sh | sh

5 umount -l ${1}root 2> /dev/null

6 umount -l ${1}root 2> /dev/null

7 - rm -rf ${1}rw

8 + rm -rf ${1}rw ${1}data ${1}work

9 rmdir ${1}r*

10 }

11

12 @@ -1038,8 +1038,8 @@

13 grep -q ^AUFS_NOT_SUPPORTED $receipt && return

14 grep -q ^AUFS_NOT_RAMFS $receipt && base="/mnt/aufsmnt$$"

15 [ -n "$AUFS_MOUNTS" -a ! -f /aufs-umount.sh ] || return

16 - grep "^nodev.aufs$" /proc/filesystems || modprobe aufs 2> /dev/null || return

17 - mkdir ${base}root ${base}rw || return

18 + grep "^nodev.overlay$" /proc/filesystems || modprobe overlay 2> /dev/null || return

19 + mkdir ${base}root ${base}rw ${base}data ${base}work|| return

20

21 _ 'Setup aufs chroot...'

22

23 @@ -1052,10 +1052,10 @@

24 done

25 for mnt in $(ls -d $AUFS_MOUNTS | sort | uniq); do

26 mount --bind $mnt ${base}root$mnt

27 - if [ $mnt == / ] && ! mount -t aufs -o br=${base}rw:/ none ${base}root; then

28 + if [ $mnt == / ] && ! mount -t overlay -o redirect_dir=on,lowerdir=${base}rw:/,upperdir=${base}data,workdir=${base}work none ${base}root; then

29 _ 'Aufs mount failure'

30 umount ${base}root

31 - rm -rf ${base}r*

32 + rm -rf ${base}*

33 return

34 fi

35 echo "umount ${base}root$mnt" >> ${base}rw/aufs-umount.sh

36 --- a/cook.conf

37 +++ b/cook.conf

38 @@ -38,7 +38,7 @@

39

40 # List of packages installed in build chroot by cook or the Cooker setup.

41 SETUP_PKGS="slitaz-toolchain pkg-config intltool gettext zlib-dev bzip2

42 -aufs-utils aufs m4 syslinux-extra pcre pcre-dev bash xorg-dev mercurial

43 +linux-overlayfs m4 syslinux-extra pcre pcre-dev bash xorg-dev mercurial

44 rsync dropbear tazlito"

45

46 # Target host architecture type (Glibc doesn't support i386 anymore).