[SCM] live-boot branch, tmp-persistent-custom, updated. debian/3.0_a25-1-46-g1e888cb

[Tails developers]

The following commit has been merged in the tmp-persistent-custom branch:
commit d65697ce0aa3db59314c35851e5c701b6dc0f5ba
Author: Tails developers <amnesia at boum.org>
Date:   Mon Mar 19 23:41:26 2012 +0100

    Do not allow mutually exclusive custom mount options.

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 7eb45e9..7c4e0d7 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -1357,6 +1357,11 @@ activate_custom_mounts ()
 			esac
 		done
 
+		if [ -n "${opt_linkfiles}" ] && [ -n "${opt_union}" ]
+		then
+			log_warning_msg "Skipping custom mount ${dest} with options ${options}: \"linkfiles\" and \"union\" are mutually exclusive options"
+		fi
+
 		if [ -n "$(what_is_mounted_on "${dest}")" ]
 		then
 			log_warning_msg "Skipping custom mount ${source} on ${dest}: $(what_is_mounted_on "${dest}") is already mounted there"

-- 
live-boot