tazlito rev 488

merge: directories
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Mar 01 18:05:06 2018 +0100 (16 months ago)
parents b5e7737cce0b
children 4cfb991effc5
files tazlito
line diff
     1.1 --- a/tazlito	Mon Feb 26 11:04:13 2018 +0100
     1.2 +++ b/tazlito	Thu Mar 01 18:05:06 2018 +0100
     1.3 @@ -965,6 +965,7 @@
     1.4  	while read file; do
     1.5  		files_match "$1/$file" "$2/$file" "$file" &&
     1.6  		remove_with_path "$2/$file"
     1.7 +		[ -d "$1/$file" ] && [ -d "$2/$file" ] && rmdir "$2/$file" 2>/dev/null
     1.8  	done
     1.9  
    1.10  	unset IFS
    1.11 @@ -2709,7 +2710,7 @@
    1.12  				install_list_to_rootfs "$DISTRO/list-packages0$n" "${ROOTFS}0$n"
    1.13  
    1.14  				action 'Updating the boot directory...'
    1.15 -				yes n | cp -ai ${ROOTFS}0$n/boot $ROOTCD
    1.16 +				yes n | cp -ai ${ROOTFS}0$n/boot $ROOTCD 2> /dev/null
    1.17  				rm -rf ${ROOTFS}0$n/boot
    1.18  
    1.19  				cd $DISTRO