# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1519923906 -3600
# Node ID 3dee688b1ec19953fff2d6c43c8d104ab993a50d
# Parent  b5e7737cce0bac0b87bd1fa301ed7c9bdbd39779
merge: directories

diff -r b5e7737cce0b -r 3dee688b1ec1 tazlito
--- a/tazlito	Mon Feb 26 11:04:13 2018 +0100
+++ b/tazlito	Thu Mar 01 18:05:06 2018 +0100
@@ -965,6 +965,7 @@
 	while read file; do
 		files_match "$1/$file" "$2/$file" "$file" &&
 		remove_with_path "$2/$file"
+		[ -d "$1/$file" ] && [ -d "$2/$file" ] && rmdir "$2/$file" 2>/dev/null
 	done
 
 	unset IFS
@@ -2709,7 +2710,7 @@
 				install_list_to_rootfs "$DISTRO/list-packages0$n" "${ROOTFS}0$n"
 
 				action 'Updating the boot directory...'
-				yes n | cp -ai ${ROOTFS}0$n/boot $ROOTCD
+				yes n | cp -ai ${ROOTFS}0$n/boot $ROOTCD 2> /dev/null
 				rm -rf ${ROOTFS}0$n/boot
 
 				cd $DISTRO