From 5abe4bacca7eb71398e8f8285d777cbc7d15ba42 Mon Sep 17 00:00:00 2001 From: Tails developers Date: Mon, 19 Mar 2012 23:41:26 +0100 Subject: Do not allow mutually exclusive custom mount options. --- scripts/live-helpers | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'scripts') 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" -- cgit v1.2.3