projects
/
live-boot-grml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0804cf7
)
Do not allow mutually exclusive custom mount options.
author
Tails developers
<amnesia@boum.org>
Mon, 19 Mar 2012 22:41:26 +0000
(23:41 +0100)
committer
Daniel Baumann
<daniel@debian.org>
Thu, 5 Apr 2012 05:49:15 +0000
(07:49 +0200)
scripts/live-helpers
patch
|
blob
|
history
diff --git
a/scripts/live-helpers
b/scripts/live-helpers
index
7eb45e9
..
7c4e0d7
100644
(file)
--- 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"