Merging casper 1.118.

grml · Feb 26, 2008 · 076a6c1 · 076a6c1
1 parent dd986a1
commit 076a6c1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git 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
@@ -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