From ae670d0290960e3d42ae49a5b601c80bafc15db1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Mon, 3 Aug 2015 17:49:53 +0200
Subject: [PATCH] liveusb: mount /var/lib/qubes using overlayfs on tmpfs,
 instead of dm-snapshot

When dm-snapshot fills up, it is not recoverable situation. Also much
less flexible (for example deleting files does not free the space).
---
 conf/liveusb.ks |  3 +++
 live/livesys    | 13 +++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/conf/liveusb.ks b/conf/liveusb.ks
index e84166e..35d6385 100644
--- a/conf/liveusb.ks
+++ b/conf/liveusb.ks
@@ -104,6 +104,9 @@ qubes-set-updates disable
 chgrp -R qubes /var/lib/qubes
 chmod -R g+w /var/lib/qubes
 
+mv /var/lib/qubes /var/lib/qubes-base
+mkdir -p /var/lib/qubes
+
 %end
 
 
diff --git a/live/livesys b/live/livesys
index 9f00b41..3e69cdf 100755
--- a/live/livesys
+++ b/live/livesys
@@ -100,8 +100,21 @@ fi
 # if we have a persistent /home, then we want to go ahead and mount it
 if ! strstr "`cat /proc/cmdline`" nopersistenthome && [ -n "$homedev" ] ; then
   action "Mounting persistent /home" mountPersistentHome
+  mkdir -p /home/qubes
+else
+  mkdir -p /home/qubes
+  mount -t tmpfs none /home/qubes
 fi
 
+mkdir -p /home/qubes/qubes
+mkdir -p /home/qubes/workdir
+ln -nsf /var/lib/qubes-base/vm-templates /home/qubes/qubes/vm-templates
+mount -t overlay overlay \
+          -o lowerdir=/var/lib/qubes-base \
+          -o upperdir=/home/qubes/qubes \
+          -o workdir=/home/qubes/workdir \
+          /var/lib/qubes
+
 /usr/bin/qvm-prefs --offline-mode -s sys-net pcidevs '[]'
 for dev in $(/sbin/lspci -mm -n | sed -ne 's/^\([0-9][0-9]:[0-9][0-9].[0-9]\) "02.*/\1/p'); do
     /usr/bin/qvm-pci --offline-mode -a sys-net $dev