From: Daniel Baumann <daniel@debian.org>
Date: Tue, 26 Feb 2008 11:40:16 +0000 (+0100)
Subject: Merging casper 1.118.
X-Git-Tag: debian/2.0.15-1~609
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=edff8f6f9d2e028e399f055187e4982a73504e62

Merging casper 1.118.
---

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index ea43f07..88245c9 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,10 @@
+casper (1.118) hardy; urgency=low
+
+  [ Julian Andres Klode, Colin Watson ]
+  * Use aufs instead of unionfs if union=aufs is given (LP: #187259).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 14 Feb 2008 18:00:36 +0000
+
 casper (1.117) hardy; urgency=low
 
   * Disable speech for magnifier and braille profiles again.  Thanks
diff --git a/scripts/live b/scripts/live
index 0443e35..332de10 100755
--- a/scripts/live
+++ b/scripts/live
@@ -892,6 +892,9 @@ setup_unionfs ()
 	then
 		# go aroung a bug in nfs-unionfs locking for unionfs <= 1.4
 		roopt="nfsro"
+	elif [ "${UNIONTYPE}" = "aufs" ]
+	then
+		roopt="rr"
 	else
 		roopt="ro"
 	fi