From 87eb49cdac067902875ad073af1420478040e8ed Mon Sep 17 00:00:00 2001
From: udeved <flower_of_life@gmx.net>
Date: Sun, 14 Dec 2014 18:32:40 +0100
Subject: [PATCH] fix calameres paths

---
 lib/util-livecd.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/util-livecd.sh b/lib/util-livecd.sh
index d7ec93f..8e1af14 100644
--- a/lib/util-livecd.sh
+++ b/lib/util-livecd.sh
@@ -282,8 +282,8 @@ configure_accountsservice(){
 # $1: chroot
 configure_calamares(){
     msg2 "Configuring Calamares ..."
-    mkdir -p ${work_dir}/overlay/etc/calamares/modules            
-    local UNPACKFS="$1/overlay/etc/calamares/modules/unpackfs.conf"            
+    mkdir -p ${work_dir}/etc/calamares/modules            
+    local UNPACKFS="$1/etc/calamares/modules/unpackfs.conf"            
     if [ ! -e $UNPACKFS ] ; then                              
         echo "---" > "$UNPACKFS"
         echo "unpack:" >> "$UNPACKFS"
@@ -294,7 +294,7 @@ configure_calamares(){
         echo "        sourcefs: \"squashfs\"" >> "$UNPACKFS"
         echo "        destination: \"\"" >> "$UNPACKFS"                
     fi
-    local DISPLAYMANAGER="$1/overlay/etc/calamares/modules/displaymanager.conf"
+    local DISPLAYMANAGER="$1/etc/calamares/modules/displaymanager.conf"
     # TODO maybe add a configuration flag in manjaro-tools.conf for default displymanager
     if [ ! -e $DISPLAYMANAGER ] ; then
         echo "---" > "$DISPLAYMANAGER"
@@ -321,7 +321,7 @@ configure_calamares(){
             echo "  - slim" >> "$DISPLAYMANAGER"
         fi                
     fi
-    local INITCPIO="$1/overlay/etc/calamares/modules/initcpio.conf"
+    local INITCPIO="$1/etc/calamares/modules/initcpio.conf"
     if [ ! -e $INITCPIO ] ; then
         echo "---" > "$INITCPIO"
         echo "kernel: ${manjaro_kernel}" >> "$INITCPIO"