From a1b88b49e6139cf7f0ac465430e3370773ab6017 Mon Sep 17 00:00:00 2001
From: "Fernando Reyes (likewhoa)" <design@missionaccomplish.com>
Date: Thu, 29 May 2014 04:40:18 +0200
Subject: This fixes /etc/fstab from not working while in setup_aufs function
 and instead includes it in the union path.

---
 defaults/initrd.scripts | 1 -
 defaults/linuxrc        | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 68c0ef7a..c76abb50 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -1380,7 +1380,6 @@ setup_squashfs_aufs() {
 
 	[ ! -d "${NEW_ROOT}${overlay}" ] && mkdir -p "${NEW_ROOT}${overlay}"
 	[ ! -d "${NEW_ROOT}${static}" ] && mkdir -p "${NEW_ROOT}${static}"
-	echo "aufs / aufs defaults 0 0" > "${NEW_ROOT}"/etc/fstab
 	for i in "${overlay}" "${static}"; do mount --move "${i}" "${NEW_ROOT}${i}"; done
 
 	# have handy /mnt/cdrom (CDROOT_PATH) as well
diff --git a/defaults/linuxrc b/defaults/linuxrc
index 6d942a13..d5b424c3 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -820,6 +820,10 @@ memory|/.unions/memory/xino"' "${UNION}"/etc/rc.conf) &&
 "/newroot/mnt/changesdev|/mnt/livecd|/mnt/cdrom|"\
 "/.unions/memory|/.unions/memory/xino\"">> "${UNION}"/etc/rc.conf
 
+                # Fstab change for aufs
+                test ! $(grep aufs "${UNION}"/etc/fstab) &&
+                        echo "aufs / aufs defaults 0 0" > "${UNION}"/etc/fstab
+
 		warn_msg "Adding all modules in $MODULESD/modules/"
 		if [ -z "${MODULESD}" ]
 		then
-- 
cgit v1.2.3-65-gdbad