=== modified file 'debian/changelog'
--- debian/changelog	2008-01-25 15:47:52 +0000
+++ debian/changelog	2008-01-30 08:36:57 +0000
@@ -1,8 +1,13 @@
 casper (1.116) UNRELEASED; urgency=low
 
+  [ Evan Dandrea ]
   * Fix setting orca options in 30accessibility.
 
- -- Evan Dandrea <evand@ubuntu.com>  Fri, 25 Jan 2008 15:41:55 +0000
+  [ Julian Andres Klode ]
+  * Add support for aufs and make it the default
+    - To use unionfs, use the unionfs=unionfs on the kernel command line
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Wed, 30 Jan 2008 09:33:34 +0100
 
 casper (1.115) hardy; urgency=low
 

=== modified file 'hooks/casper'
--- hooks/casper	2007-12-14 15:06:20 +0000
+++ hooks/casper	2008-01-30 08:09:31 +0000
@@ -19,6 +19,7 @@
 . /usr/share/initramfs-tools/hook-functions
 
 manual_add_modules unionfs
+manual_add_modules aufs
 
 # We need losetup
 copy_exec /sbin/losetup /sbin

=== modified file 'scripts/casper'
--- scripts/casper	2007-12-14 15:06:20 +0000
+++ scripts/casper	2008-01-30 08:40:15 +0000
@@ -37,6 +37,12 @@
                 export PERSISTENT="Yes" ;;
             nopersistent)
                 export PERSISTENT="" ;;
+            union=*)
+                UNIONFS="${x#union=}"
+                if [ "${UNIONFS}" = "" ]; then
+                    UNIONFS="aufs"
+                fi
+                export UNIONFS;;
             ip*)
                 STATICIP=${x#ip=}
                 if [ "${STATICIP}" = "" ]; then
@@ -342,7 +348,7 @@
     image_directory="$1"
     rootmnt="$2"
 
-    modprobe "${MP_QUIET}" -b unionfs
+    modprobe "${MP_QUIET}" -b ${UNIONFS}
 
     # run-init can't deal with images in a subdir, but we're going to
     # move all of these away before it runs anyway.  No, we're not,
@@ -356,6 +362,8 @@
     rofslist=""
     if [ "${NETBOOT}" = "nfs" ] ; then
         roopt="nfsro" # go aroung a bug in nfs-unionfs locking
+    elif [ "${UNIONFS}" = "aufs" ]; then
+	roopt="rr"
     else
         roopt="ro"
     fi
@@ -398,7 +406,7 @@
 
     mount ${cowdevice} -t ${cow_fstype} -o rw,noatime /cow || panic "Can not mount $cowdevice on /cow"
 
-    mount -t unionfs -o noatime,dirs=/cow=rw:$rofsstring unionfs "$rootmnt" || panic "Unionfs mount failed"
+    mount -t ${UNIONFS} -o noatime,dirs=/cow=rw:$rofsstring ${UNIONFS} "$rootmnt" || panic "Unionfs mount failed"
 
     # Adding other custom mounts
     if [ -n "${PERSISTENT}" ]; then

=== modified file 'scripts/casper-bottom/12fstab'
--- scripts/casper-bottom/12fstab	2007-03-30 10:34:59 +0000
+++ scripts/casper-bottom/12fstab	2008-01-30 08:40:50 +0000
@@ -22,7 +22,7 @@
 log_begin_msg "$DESCRIPTION"
 
 cat > $FSTAB <<EOF
-unionfs / unionfs rw 0 0
+${UNIONFS} / ${UNIONFS} rw 0 0
 tmpfs /tmp tmpfs nosuid,nodev 0 0
 EOF