[SCM] live-boot branch, debian, updated. debian/3.0_a25-1-72-gfc7a680
Daniel Baumann
daniel at debian.org
Thu Apr 5 06:21:41 UTC 2012
The following commit has been merged in the debian branch:
commit 5abe4bacca7eb71398e8f8285d777cbc7d15ba42
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
More information about the debian-live-changes
mailing list