[SCM] live-boot branch, debian-next, updated. debian/3.0_a25-1-21-gbae59cf

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit c86b5d49885f2e52e06f27569b666e68a81d860c
Author: Tails developers <amnesia at boum.org>
Date:   Thu Feb 9 12:08:58 2012 +0100

    Workaround busybox's inability to detect symlinks with [ -e ].
    
    link_files() won't remove symlinks at the destination, which could
    cause trouble.

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 3ec1e7b..3de16e5 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -596,14 +596,11 @@ link_files ()
 			fi
 			link_files "${src}" "${dest}" "${src_mask}"
 		else
-			if [ -e "${dest}" ];
-			then
-				rm -rf "${dest}"
-			fi
 			if [ -n "${src}" ];
 			then
 				src="$(echo ${src} | sed "s|^${src_mask}||")"
 			fi
+			rm -rf "${dest}" 2> /dev/null
 			ln -s "${src}" "${dest}"
 		fi
 	done

-- 
live-boot