tazlito rev 397

tazlito: fix multi-rootfs preparing
author Aleksej Bobylev <al.bobylev@gmail.com>
date Tue Nov 17 18:54:57 2015 +0200 (2015-11-17)
parents 0a9a1d9376b0
children f54aea580f22
files tazlito
line diff
     1.1 --- a/tazlito	Tue Nov 17 03:57:02 2015 +0200
     1.2 +++ b/tazlito	Tue Nov 17 18:54:57 2015 +0200
     1.3 @@ -2192,8 +2192,9 @@
     1.4  
     1.5  				# Use packages repository as mirror, don't download unsynced packages from mirror server
     1.6  				mkdir -p ${ROOTFS}0$n/home/slitaz; ln -s ../../../../packages ${ROOTFS}0$n/home/slitaz/packages
     1.7 -				echo '/home/slitaz/packages' > "$ROOTFS/var/lib/tazpkg/mirror"
     1.8 -				tazpkg --root=${ROOTFS}0$n >/dev/null # initial tazpkg setup in empty rootfs
     1.9 +				mkdir -p "${ROOTFS}0$n/var/lib/tazpkg"
    1.10 +				echo '/home/slitaz/packages' > "${ROOTFS}0$n/var/lib/tazpkg/mirror"
    1.11 +				tazpkg --root=${ROOTFS}0$n >/dev/null 2>&1 # initial tazpkg setup in empty rootfs
    1.12  
    1.13  				for pkg in $(cat $DISTRO/list-packages0$n)
    1.14  				do
    1.15 @@ -2207,9 +2208,10 @@
    1.16  				find ${ROOTFS}0$n/var/cache/tazpkg -name '*.tazpkg' -delete
    1.17  				# Clean /var/lib/tazpkg
    1.18  				rm ${ROOTFS}0$n/var/lib/tazpkg/ID* ${ROOTFS}0$n/var/lib/tazpkg/descriptions.txt \
    1.19 -					${ROOTFS}0$n/var/lib/tazpkg/extra.list ${ROOTFS}0$n/var/lib/tazpkg/files*
    1.20 +					${ROOTFS}0$n/var/lib/tazpkg/extra.list ${ROOTFS}0$n/var/lib/tazpkg/files* \
    1.21 +					2>/dev/null
    1.22  				# Back to default mirror
    1.23 -				rm ${ROOTFS}0$n/home/slitaz/packages; rmdir ${ROOTFS}0$n/home/slitaz
    1.24 +				rm -rf ${ROOTFS}0$n/home/slitaz
    1.25  				echo "$DEFAULT_MIRROR" > ${ROOTFS}0$n/var/lib/tazpkg/mirror
    1.26  
    1.27  				cd $DISTRO