--- /usr/sbin/makechrootpkg.orig	2009-12-14 14:52:10.469919408 +0100
+++ /usr/sbin/makechrootpkg	2009-12-14 15:03:13.279804694 +0100
@@ -123,7 +123,15 @@
         echo "ERROR: No aufs available. Abandon ship!" && exit 1
     fi
 fi
-mount -t aufs none -o "dirs=$chrootdir/$LAYER=rw:$chrootdir/root=ro" "$uniondir"
+
+# If on XFS mount xino on /dev/shm, otherwise makechrootpkg will fail
+df -T -x xfs "$chrootdir" >/dev/null 2>&1
+if [ $? -ne 0 ] ; then
+    mount -t aufs none -o "dirs=$chrootdir/$LAYER=rw:$chrootdir/root=ro,xino=/dev/shm/aufs.xino" "$uniondir"
+else
+    mount -t aufs none -o "dirs=$chrootdir/$LAYER=rw:$chrootdir/root=ro" "$uniondir"
+fi
+
 trap 'cleanup' 0 1 2 15
 
 if [ -n "$install_pkg" ]; then