Do not allow mutually exclusive custom mount options.
authorTails developers <amnesia@boum.org>
Mon, 19 Mar 2012 22:41:26 +0000 (23:41 +0100)
committerDaniel Baumann <daniel@debian.org>
Thu, 5 Apr 2012 05:49:15 +0000 (07:49 +0200)
scripts/live-helpers

index 7eb45e9..7c4e0d7 100644 (file)
@@ -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"