root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

add copy for init overlays

Browse source
This commit is contained in:
udeved 2014-12-12 21:41:06 +01:00
parent 97abe6a3f6
commit c82f4d8e20
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/buildiso.in
View file

@ -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"

19
lib/util-iso.sh
View file

@ -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"