wok-current rev 25739
Time to switch to overlay, thanks aufs for your service in many years
author | Stanislas Leduc <shann@slitaz.org> |
---|---|
date | Fri Jan 31 15:05:12 2025 +0000 (4 weeks ago) |
parents | 62638b76262f |
children | d92b666dd5c5 |
files | cookutils/receipt cookutils/stuff/cook-overlay.patch |
line diff
1.1 --- a/cookutils/receipt Wed Jan 29 10:54:12 2025 +0000 1.2 +++ b/cookutils/receipt Fri Jan 31 15:05:12 2025 +0000 1.3 @@ -38,6 +38,7 @@ 1.4 patch -p1 -i $stuff/current-version.patch 1.5 patch -p1 -i $stuff/cook-x86_64.patch 1.6 patch -p1 -i $stuff/cook-git-branch.patch 1.7 + patch -p1 -i $stuff/cook-overlay.patch 1.8 sed -i 's|preinit core-4in1|preinit core-4in1 core-5in1|' cookiso 1.9 mkdir -p $DESTDIR/usr/bin $DESTDIR/etc/slitaz 1.10 make DESTDIR=$DESTDIR install
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/cookutils/stuff/cook-overlay.patch Fri Jan 31 15:05:12 2025 +0000 2.3 @@ -0,0 +1,46 @@ 2.4 +--- a/cook 2.5 ++++ b/cook 2.6 +@@ -1021,7 +1021,7 @@ 2.7 + tac ${1}rw/aufs-umount.sh | sh 2.8 + umount -l ${1}root 2> /dev/null 2.9 + umount -l ${1}root 2> /dev/null 2.10 +- rm -rf ${1}rw 2.11 ++ rm -rf ${1}rw ${1}data ${1}work 2.12 + rmdir ${1}r* 2.13 + } 2.14 + 2.15 +@@ -1038,8 +1038,8 @@ 2.16 + grep -q ^AUFS_NOT_SUPPORTED $receipt && return 2.17 + grep -q ^AUFS_NOT_RAMFS $receipt && base="/mnt/aufsmnt$$" 2.18 + [ -n "$AUFS_MOUNTS" -a ! -f /aufs-umount.sh ] || return 2.19 +- grep "^nodev.aufs$" /proc/filesystems || modprobe aufs 2> /dev/null || return 2.20 +- mkdir ${base}root ${base}rw || return 2.21 ++ grep "^nodev.overlay$" /proc/filesystems || modprobe overlay 2> /dev/null || return 2.22 ++ mkdir ${base}root ${base}rw ${base}data ${base}work|| return 2.23 + 2.24 + _ 'Setup aufs chroot...' 2.25 + 2.26 +@@ -1052,10 +1052,10 @@ 2.27 + done 2.28 + for mnt in $(ls -d $AUFS_MOUNTS | sort | uniq); do 2.29 + mount --bind $mnt ${base}root$mnt 2.30 +- if [ $mnt == / ] && ! mount -t aufs -o br=${base}rw:/ none ${base}root; then 2.31 ++ if [ $mnt == / ] && ! mount -t overlay -o redirect_dir=on,lowerdir=${base}rw:/,upperdir=${base}data,workdir=${base}work none ${base}root; then 2.32 + _ 'Aufs mount failure' 2.33 + umount ${base}root 2.34 +- rm -rf ${base}r* 2.35 ++ rm -rf ${base}* 2.36 + return 2.37 + fi 2.38 + echo "umount ${base}root$mnt" >> ${base}rw/aufs-umount.sh 2.39 +--- a/cook.conf 2.40 ++++ b/cook.conf 2.41 +@@ -38,7 +38,7 @@ 2.42 + 2.43 + # List of packages installed in build chroot by cook or the Cooker setup. 2.44 + SETUP_PKGS="slitaz-toolchain pkg-config intltool gettext zlib-dev bzip2 2.45 +-aufs-utils aufs m4 syslinux-extra pcre pcre-dev bash xorg-dev mercurial 2.46 ++linux64-overlayfs m4 syslinux-extra pcre pcre-dev bash xorg-dev mercurial 2.47 + rsync dropbear tazlito" 2.48 + 2.49 + # Target host architecture type (Glibc doesn't support i386 anymore).