Workaround busybox's inability to detect symlinks with [ -e ].
authorTails developers <amnesia@boum.org>
Thu, 9 Feb 2012 11:08:58 +0000 (12:08 +0100)
committerDaniel Baumann <daniel@debian.org>
Sun, 1 Apr 2012 20:06:37 +0000 (22:06 +0200)
link_files() won't remove symlinks at the destination, which could
cause trouble.

scripts/live-helpers

index 3ec1e7b..3de16e5 100644 (file)
@@ -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