From b7d31b7751b06a52e5ee149b8831657a92e1bdcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ciar=C3=A1n=20McKenna?= <ciaranmckenna@outlook.ie>
Date: Thu, 26 Aug 2021 19:41:50 +0200
Subject: [PATCH] guest-overlay: Use OverlayFS instead of AuFS

---
 guest-overlay/files/pam_mount.conf.xml | 4 +++-
 guest-overlay/tasks/main.yml           | 5 ++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/guest-overlay/files/pam_mount.conf.xml b/guest-overlay/files/pam_mount.conf.xml
index abfeb7c..7f5241e 100644
--- a/guest-overlay/files/pam_mount.conf.xml
+++ b/guest-overlay/files/pam_mount.conf.xml
@@ -19,7 +19,9 @@
 
 <volume sgrp="gast" fstype="tmpfs" path="tmpfs" mountpoint="/guests/temporary" options="noatime,noexec,rw" />
 
-<volume path="none" sgrp="gast" fstype="aufs" mountpoint="/guests/home" options="br:/guests/temporary=rw:/guests/provision=ro,udba=reval" />
+<volume sgrp="gast" fstype="tmpfs" path="tmpfs" mountpoint="/guests/temporary_workdir" options="noatime,noexec,rw" />
+
+<volume path="none" sgrp="gast" fstype="overlay" mountpoint="/guests/home" options="lowerdir=/guests/provision,upperdir=/guests/temporary,workdir=/guests/temporary_workdir" />
 
 <!-- pam_mount parameters: General tunables -->
 
diff --git a/guest-overlay/tasks/main.yml b/guest-overlay/tasks/main.yml
index d493dc2..accaeeb 100644
--- a/guest-overlay/tasks/main.yml
+++ b/guest-overlay/tasks/main.yml
@@ -22,17 +22,16 @@
   tags:
     - guest-overlay
 
-- name: ensure aufs and pam-mount are available
+- name: ensure pam-mount available
   apt:
     name:
-      - aufs-tools
       - libpam-mount
     state: present
   tags:
     - guest-overlay
     - packages
 
-- name: ensure aufs mountpoints are available
+- name: ensure overlayfs mountpoints are available
   file:
     path: "/guests/{{ item }}"
     state: directory
-- 
GitLab