diff options
| author | Daniel Baumann <daniel@debian.org> | 2008-02-26 12:40:16 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:31:06 +0100 |
| commit | edff8f6f9d2e028e399f055187e4982a73504e62 (patch) | |
| tree | e44ab9a0bd68b260dce4cc052a98d5bd4ef3517b | |
| parent | cc8532df0a706a167cfd423bc13a69b7be9ffef9 (diff) | |
| download | live-boot-edff8f6f9d2e028e399f055187e4982a73504e62.tar.gz live-boot-edff8f6f9d2e028e399f055187e4982a73504e62.zip | |
Merging casper 1.118.
| -rw-r--r-- | docs/ChangeLog.casper | 7 | ||||
| -rwxr-xr-x | scripts/live | 3 |
2 files changed, 10 insertions, 0 deletions
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 |