diff options
| author | Tails developers <amnesia@boum.org> | 2012-03-19 23:41:26 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-04-05 07:49:15 +0200 |
| commit | 5abe4bacca7eb71398e8f8285d777cbc7d15ba42 (patch) | |
| tree | 63808ca5f9f693ab8181acef9007e62ca37c0c59 /scripts | |
| parent | 0804cf7a59f902703340ce47b4e0c93f93cc20e9 (diff) | |
| download | live-boot-5abe4bacca7eb71398e8f8285d777cbc7d15ba42.tar.gz live-boot-5abe4bacca7eb71398e8f8285d777cbc7d15ba42.zip | |
Do not allow mutually exclusive custom mount options.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/live-helpers | 5 |
1 files changed, 5 insertions, 0 deletions
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" |