root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

copy DE-overlay in livecd-image function to avoid fs conflicts

Browse source
This commit is contained in:
udeved 2014-12-19 23:42:46 +01:00
parent 0f975b3dd8
commit 47b7ae86f9
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/util-iso.sh
View file

@ -516,9 +516,11 @@ make_de_image() {
cp "${work_dir}/${desktop}-image/${desktop}-image-pkgs.txt" ${target_dir}/${img_name}-${desktop}-${iso_version}-${arch}-pkgs.txt
if [ -e ${desktop}-overlay ] ; then
copy_overlay_desktop
fi
# copy later in livecd-image to support livecd packages
# otherwise filesystemconflicts will be complained by pacman
# if [ -e ${desktop}-overlay ] ; then
# copy_overlay_desktop
# fi
${auto_svc_conf} && configure_services "${work_dir}/${desktop}-image"
@ -539,14 +541,14 @@ make_livecd_image() {
mkdir -p ${work_dir}/livecd-image
if [ ! -z "$(mount -l | grep livecd-image)" ]; then
if [ -n "$(mount -l | grep livecd-image)" ]; then
umount -l ${work_dir}/livecd-image
fi
msg2 "mount root-image"
mount -t aufs -o br=${work_dir}/livecd-image:${work_dir}/root-image=ro none ${work_dir}/livecd-image
if [ ! -z "${desktop}" ] ; then
if [ -n "${desktop}" ] ; then
msg2 "mount ${desktop}-image"
mount -t aufs -o remount,append:${work_dir}/${desktop}-image=ro none ${work_dir}/livecd-image
fi
@ -555,6 +557,8 @@ make_livecd_image() {
pacman -Qr "${work_dir}/livecd-image" > "${work_dir}/livecd-image/livecd-image-pkgs.txt"
[[ -d ${desktop}-overlay ]] && copy_overlay_desktop
copy_overlay_livecd "${work_dir}/livecd-image"
configure_livecd_image "${work_dir}/livecd-image"