From c82f4d8e20f05cec1a672c7d041dc7cbc2091493 Mon Sep 17 00:00:00 2001
From: udeved <flower_of_life@gmx.net>
Date: Fri, 12 Dec 2014 21:41:06 +0100
Subject: [PATCH] add copy for init overlays

---
 bin/buildiso.in |  2 +-
 lib/util-iso.sh | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/bin/buildiso.in b/bin/buildiso.in
index c0c10f0..6bc0127 100755
--- a/bin/buildiso.in
+++ b/bin/buildiso.in
@@ -82,7 +82,7 @@ make_overlay() {
       
 	copy_overlay_livecd "${work_dir}/overlay"
         
-	copy_livecd '/usr/share/manjaro-tools'
+	copy_livecd '@pkgdatadir@/livecd'
 	    
 	copy_livecd_init "${work_dir}/overlay"
 	
diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index 6b4a628..34820f7 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -36,11 +36,10 @@ copy_manjaro_tools_conf(){
 }
 
 copy_livecd(){
-    local livecd=$1
     
-    msg2 "Copying $1/livecd to ${work_dir}/overlay/opt ..."
+    msg2 "Copying $1 to ${work_dir}/overlay/opt ..."
     [[ ! -d ${work_dir}/overlay/opt ]] && mkdir -p ${work_dir}/overlay/opt
-    cp -r $1/livecd ${work_dir}/overlay/opt
+    cp -r $1 ${work_dir}/overlay/opt
     
     msg2 "Fixing livecd script permissions ..."
     chmod 755 ${work_dir}/overlay/opt/livecd/{livecd,mhwd,lg,km,ejectcd,disable-dpms,pulseaudio-ctl-normal,setup,setup-0.8,setup-0.9,update-setup}
@@ -75,6 +74,18 @@ copy_livecd_init(){
 	fi
 }
 
+copy_overlay_init(){
+	if [[ -d overlay-openrc ]]; then
+	    msg2 "Copying overlay-openrc/ to $1 ..."
+	    cp -a overlay-openrc/* $1
+        fi
+        
+        if [[ -d overlay-systemd ]]; then
+	    msg2 "Copying overlay-systemd/ to $1 ..."
+	    cp -a overlay-systemd/* $1
+	fi
+}
+
 copy_overlay_livecd(){
 	msg2 "Copying overlay-livecd to $1 ..."
 	cp -a overlay-livecd/* $1
@@ -154,7 +165,6 @@ configure_services_livecd(){
    fi
 }
 
-
 # $1: chroot
 configue_displaymanager(){
     local _dm
@@ -650,6 +660,7 @@ make_root_image() {
 	fi
 	
 	copy_overlay "${work_dir}/root-image"
+	copy_overlay_init "${work_dir}/root-image"
 
 	# set hostname
 	configue_hostname "${work_dir}/root-image"