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

make overlay a chroot

Browse source
This commit is contained in:
udeved 2014-12-13 23:19:33 +01:00
parent c8969e6dcc
commit da783d783d
2 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
bin/buildiso.in
View file

@ -77,6 +77,23 @@ make_overlay() {
if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
msg "Prepare overlay-image" msg "Prepare overlay-image"
########################
# create overlay chroot
mkdir -p ${work_dir}/overlay-image
if [ ! -z "$(mount -l | grep overlay-image)" ]; then
umount -l ${work_dir}/overlay-image
fi
mount -t aufs -o br=${work_dir}/overlay-image:${work_dir}/root-image=ro none ${work_dir}/overlay-image
mkiso ${create_args[*]} -i "overlay-image" -p "${de_packages}" create "${work_dir}"
pacman -Qr "${work_dir}/overlay-image" > "${work_dir}/overlay-image/overlay-image-pkgs.txt"
####################
mkdir -p ${work_dir}/overlay/etc/pacman.d mkdir -p ${work_dir}/overlay/etc/pacman.d
copy_overlay_livecd "${work_dir}/overlay" copy_overlay_livecd "${work_dir}/overlay"
@ -95,8 +112,17 @@ make_overlay() {
cp ${work_dir}/root-image/etc/pacman.d/mirrorlist ${work_dir}/overlay/etc/pacman.d/mirrorlist cp ${work_dir}/root-image/etc/pacman.d/mirrorlist ${work_dir}/overlay/etc/pacman.d/mirrorlist
sed -i "s/#Server/Server/g" ${work_dir}/overlay/etc/pacman.d/mirrorlist sed -i "s/#Server/Server/g" ${work_dir}/overlay/etc/pacman.d/mirrorlist
sed -i "s/^.*TITLE=.*/ TITLE=\"Manjaro Linux Installation Framework (v${iso_version})\"/g" ${work_dir}/overlay/opt/livecd/setup
#chmod -R 755 ${work_dir}/overlay/home
#########################
# Clean up GnuPG keys?
#rm -rf "${work_dir}/${desktop}-image/etc/pacman.d/gnupg"
umount -l ${work_dir}/overlay-image
rm -R ${work_dir}/overlay-image/.wh*
: > ${work_dir}/build.${FUNCNAME} : > ${work_dir}/build.${FUNCNAME}
msg "Done" msg "Done"
fi fi

2
lib/util-iso.sh
View file

@ -44,6 +44,8 @@ copy_livecd(){
msg2 "Fixing livecd script permissions ..." 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} 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}
chmod +x ${work_dir}/overlay/opt/livecd/{livecd,mhwd,lg,km,ejectcd,disable-dpms,pulseaudio-ctl-normal,setup,setup-0.8,setup-0.9,update-setup} chmod +x ${work_dir}/overlay/opt/livecd/{livecd,mhwd,lg,km,ejectcd,disable-dpms,pulseaudio-ctl-normal,setup,setup-0.8,setup-0.9,update-setup}
sed -i "s/^.*TITLE=.*/ TITLE=\"Manjaro Linux Installation Framework (v${iso_version})\"/g" ${work_dir}/overlay/opt/livecd/setup
} }
copy_overlay(){ copy_overlay(){