From 5f8d9a688e7926a2de67347c83f769fcb94cd312 Mon Sep 17 00:00:00 2001 From: udeved Date: Tue, 9 Dec 2014 00:02:29 +0100 Subject: [PATCH] clean up commented code --- bin/build-set.in | 127 -------------- bin/buildiso.in | 424 ----------------------------------------------- 2 files changed, 551 deletions(-) diff --git a/bin/build-set.in b/bin/build-set.in index 884bc5a..2c49e74 100644 --- a/bin/build-set.in +++ b/bin/build-set.in @@ -79,133 +79,6 @@ display_settings(){ fi } -# eval_profile(){ -# eval "case $1 in -# $(load_sets)) is_profile=true ;; -# *) is_profile=false ;; -# esac" -# } -# -# chroot_create(){ -# mkdir -p "${chrootdir}" -# setarch "${arch}" mkchroot \ -# ${mkchroot_args[*]} \ -# "${chrootdir}/root" \ -# ${base_packages[*]} || abort -# } -# -# chroot_clean(){ -# for copy in "${chrootdir}"/*; do -# [[ -d ${copy} ]] || continue -# msg2 "Deleting chroot copy '$(basename "${copy}")'..." -# -# lock 9 "${copy}.lock" "Locking chroot copy '${copy}'" -# -# if [[ "$(stat -f -c %T "${copy}")" == btrfs ]]; then -# { type -P btrfs && btrfs subvolume delete "${copy}"; } &>/dev/null -# fi -# rm -rf --one-file-system "${copy}" -# done -# exec 9>&- -# -# rm -rf --one-file-system "${chrootdir}" -# } -# -# chroot_update(){ -# lock 9 "${chrootdir}/root.lock" "Locking clean chroot" -# chroot-run ${mkchroot_args[*]} \ -# "${chrootdir}/root" \ -# pacman -Syu --noconfirm || abort -# } -# -# clean_up(){ -# msg "Cleaning up ..." -# -# local query=$(find ${pkg_dir} -maxdepth 1 -name "*.*") -# -# [[ -n $query ]] && rm -v $query -# -# if [[ -z $LOGDEST ]];then -# query=$(find $PWD -maxdepth 2 -name '*.log') -# [[ -n $query ]] && rm -v $query -# fi -# -# if [[ -z $SRCDEST ]];then -# query=$(find $PWD -maxdepth 2 -name '*.?z?') -# [[ -n $query ]] && rm -v $query -# fi -# } -# -# blacklist_pkg(){ -# msg "Removing ${blacklist[@]}..." -# for item in "${blacklist[@]}"; do -# chroot-run $1/root pacman -Rdd "$item" --noconfirm -# done -# } -# -# prepare_cachedir(){ -# mkdir -p "${pkg_dir}" -# chown -R "${pkg_owner}:users" "${pkg_dir_loaded}" -# } -# -# move_pkg(){ -# local ext='pkg.tar.xz' -# if [[ -n $PKGDEST ]];then -# mv $PKGDEST/*{any,$arch}.${ext} ${pkg_dir}/ -# else -# mv *.${ext} ${pkg_dir} -# fi -# chown -R "${pkg_owner}:users" "${pkg_dir_loaded}" -# } -# -# chroot_build(){ -# if ${is_profile};then -# msg "Start building profile: [${profile}]" -# for pkg in $(cat ${profiledir}/${profile}.set); do -# cd $pkg -# for p in ${blacklist_trigger[@]}; do -# if [[ $pkg == $p ]]; then -# blacklist_pkg "${chrootdir}" -# fi -# done -# setarch "${arch}" \ -# mkchrootpkg ${mkchrootpkg_args[*]} -- ${makepkg_args[*]} || break -# move_pkg -# cd .. -# done -# msg "Finished building profile: [${profile}]" -# else -# cd ${profile} -# for p in ${blacklist_trigger[@]}; do -# if [[ ${profile} == $p ]]; then -# blacklist_pkg "${chrootdir}" -# fi -# done -# setarch "${arch}" \ -# mkchrootpkg ${mkchrootpkg_args[*]} -- ${makepkg_args[*]} || abort -# move_pkg -# cd .. -# fi -# } -# -# chroot_init(){ -# if ${clean_first} || [[ ! -d "${chrootdir}" ]]; then -# msg "Creating chroot for [${branch}] (${arch})..." -# chroot_clean -# chroot_create -# else -# msg "Updating chroot for [${branch}] (${arch})..." -# chroot_update -# fi -# } -# -# sign_pkgs(){ -# cd $pkg_dir -# su "${pkg_owner}" <<'EOF' -# signpkgs -# EOF -# } - export LC_MESSAGES=C load_config '@sysconfdir@/manjaro-tools.conf' diff --git a/bin/buildiso.in b/bin/buildiso.in index bc14c7f..01742a6 100755 --- a/bin/buildiso.in +++ b/bin/buildiso.in @@ -16,189 +16,6 @@ version=@version@ [[ -r @libdir@/util-iso.sh ]] && source @libdir@/util-iso.sh # [[ -r @libdir@/util-mount.sh ]] && source @libdir@/util-mount.sh -# # Prepare ${install_dir}/boot/ -# make_boot() { -# if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then -# msg "Prepare ${install_dir}/boot/" -# mkdir -p ${work_dir}/iso/${install_dir}/boot/${arch} -# cp ${work_dir}/root-image/boot/memtest86+/memtest.bin ${work_dir}/iso/${install_dir}/boot/${arch}/memtest -# cp ${work_dir}/root-image/boot/vmlinuz* ${work_dir}/iso/${install_dir}/boot/${arch}/${manjaroiso} -# mkdir -p ${work_dir}/boot-image -# if [ ! -z "$(mount -l | grep boot-image)" ]; then -# umount -l ${work_dir}/boot-image/{proc,sys,dev} -# umount ${work_dir}/boot-image -# fi -# msg2 "mount root-image" -# mount -t aufs -o br=${work_dir}/boot-image:${work_dir}/root-image=ro none ${work_dir}/boot-image -# if [ ! -z "${desktop}" ] ; then -# msg2 "mount ${desktop}-image" -# mount -t aufs -o remount,append:${work_dir}/${desktop}-image=ro none ${work_dir}/boot-image -# fi -# mount -t proc none ${work_dir}/boot-image/proc -# mount -t sysfs none ${work_dir}/boot-image/sys -# mount -o bind /dev ${work_dir}/boot-image/dev -# cp /usr/lib/initcpio/hooks/miso* ${work_dir}/boot-image/usr/lib/initcpio/hooks -# cp /usr/lib/initcpio/install/miso* ${work_dir}/boot-image/usr/lib/initcpio/install -# cp mkinitcpio.conf ${work_dir}/boot-image/etc/mkinitcpio-${manjaroiso}.conf -# _kernver=$(cat ${work_dir}/boot-image/usr/lib/modules/*-MANJARO/version) -# chroot ${work_dir}/boot-image /usr/bin/mkinitcpio -k ${_kernver} -c /etc/mkinitcpio-${manjaroiso}.conf -g /boot/${img_name}.img -# mv ${work_dir}/boot-image/boot/${img_name}.img ${work_dir}/iso/${install_dir}/boot/${arch}/${img_name}.img -# umount -l ${work_dir}/boot-image/{proc,sys,dev} -# umount ${work_dir}/boot-image -# rm -R ${work_dir}/boot-image -# : > ${work_dir}/build.${FUNCNAME} -# msg "Done" -# fi -# } -# -# # Prepare /EFI -# make_efi() { -# if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then -# msg "Prepare ${install_dir}/boot/EFI" -# mkdir -p ${work_dir}/iso/EFI/boot -# cp ${work_dir}/root-image/usr/lib/prebootloader/PreLoader.efi ${work_dir}/iso/EFI/boot/bootx64.efi -# cp ${work_dir}/root-image/usr/lib/prebootloader/HashTool.efi ${work_dir}/iso/EFI/boot/ -# -# cp ${work_dir}/root-image/usr/lib/gummiboot/gummibootx64.efi ${work_dir}/iso/EFI/boot/loader.efi -# -# mkdir -p ${work_dir}/iso/loader/entries -# cp efiboot/loader/loader.conf ${work_dir}/iso/loader/ -# cp efiboot/loader/entries/uefi-shell-v2-x86_64.conf ${work_dir}/iso/loader/entries/ -# cp efiboot/loader/entries/uefi-shell-v1-x86_64.conf ${work_dir}/iso/loader/entries/ -# -# sed "s|%MISO_LABEL%|${iso_label}|g; -# s|%INSTALL_DIR%|${install_dir}|g" \ -# efiboot/loader/entries/${manjaroiso}-x86_64-usb.conf > ${work_dir}/iso/loader/entries/${manjaroiso}-x86_64.conf -# -# sed "s|%MISO_LABEL%|${iso_label}|g; -# s|%INSTALL_DIR%|${install_dir}|g" \ -# efiboot/loader/entries/${manjaroiso}-x86_64-nonfree-usb.conf > ${work_dir}/iso/loader/entries/${manjaroiso}-x86_64-nonfree.conf -# -# # EFI Shell 2.0 for UEFI 2.3+ ( http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=UEFI_Shell ) -# curl -k -o ${work_dir}/iso/EFI/shellx64_v2.efi https://svn.code.sf.net/p/edk2/code/trunk/edk2/ShellBinPkg/UefiShell/X64/Shell.efi -# # EFI Shell 1.0 for non UEFI 2.3+ ( http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=Efi-shell ) -# curl -k -o ${work_dir}/iso/EFI/shellx64_v1.efi https://svn.code.sf.net/p/edk2/code/trunk/edk2/EdkShellBinPkg/FullShell/X64/Shell_Full.efi -# : > ${work_dir}/build.${FUNCNAME} -# msg "Done" -# fi -# } -# -# # Prepare kernel.img::/EFI for "El Torito" EFI boot mode -# make_efiboot() { -# if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then -# msg "Prepare ${install_dir}/iso/EFI" -# mkdir -p ${work_dir}/iso/EFI/miso -# truncate -s 31M ${work_dir}/iso/EFI/miso/${img_name}.img -# mkfs.vfat -n MISO_EFI ${work_dir}/iso/EFI/miso/${img_name}.img -# -# mkdir -p ${work_dir}/efiboot -# mount ${work_dir}/iso/EFI/miso/${img_name}.img ${work_dir}/efiboot -# -# mkdir -p ${work_dir}/efiboot/EFI/miso -# cp ${work_dir}/iso/${install_dir}/boot/x86_64/${manjaroiso} ${work_dir}/efiboot/EFI/miso/${manjaroiso}.efi -# cp ${work_dir}/iso/${install_dir}/boot/x86_64/${img_name}.img ${work_dir}/efiboot/EFI/miso/${img_name}.img -# -# mkdir -p ${work_dir}/efiboot/EFI/boot -# cp ${work_dir}/root-image/usr/lib/prebootloader/PreLoader.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi -# cp ${work_dir}/root-image/usr/lib/prebootloader/HashTool.efi ${work_dir}/efiboot/EFI/boot/ -# -# cp ${work_dir}/root-image/usr/lib/gummiboot/gummibootx64.efi ${work_dir}/efiboot/EFI/boot/loader.efi -# -# mkdir -p ${work_dir}/efiboot/loader/entries -# cp efiboot/loader/loader.conf ${work_dir}/efiboot/loader/ -# cp efiboot/loader/entries/uefi-shell-v2-x86_64.conf ${work_dir}/efiboot/loader/entries/ -# cp efiboot/loader/entries/uefi-shell-v1-x86_64.conf ${work_dir}/efiboot/loader/entries/ -# -# sed "s|%MISO_LABEL%|${iso_label}|g; -# s|%INSTALL_DIR%|${install_dir}|g" \ -# efiboot/loader/entries/${manjaroiso}-x86_64-dvd.conf > ${work_dir}/efiboot/loader/entries/${manjaroiso}-x86_64.conf -# -# sed "s|%MISO_LABEL%|${iso_label}|g; -# s|%INSTALL_DIR%|${install_dir}|g" \ -# efiboot/loader/entries/${manjaroiso}-x86_64-nonfree-dvd.conf > ${work_dir}/efiboot/loader/entries/${manjaroiso}-x86_64-nonfree.conf -# -# cp ${work_dir}/iso/EFI/shellx64_v2.efi ${work_dir}/efiboot/EFI/ -# cp ${work_dir}/iso/EFI/shellx64_v1.efi ${work_dir}/efiboot/EFI/ -# -# umount ${work_dir}/efiboot -# : > ${work_dir}/build.${FUNCNAME} -# msg "Done" -# fi -# } -# -# # Prepare /isolinux -# make_isolinux() { -# if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then -# msg "Prepare ${install_dir}/iso/isolinux" -# cp -Lr isolinux ${work_dir}/iso -# if [[ -e isolinux-overlay ]]; then -# msg2 "isolinux overlay found. Overwriting files." -# cp -LPr isolinux-overlay/* ${work_dir}/iso/isolinux -# fi -# if [[ -e ${work_dir}/root-image/usr/lib/syslinux/bios/ ]]; then -# cp ${work_dir}/root-image/usr/lib/syslinux/bios/isolinux.bin ${work_dir}/iso/isolinux/ -# cp ${work_dir}/root-image/usr/lib/syslinux/bios/isohdpfx.bin ${work_dir}/iso/isolinux/ -# cp ${work_dir}/root-image/usr/lib/syslinux/bios/ldlinux.c32 ${work_dir}/iso/isolinux/ -# cp ${work_dir}/root-image/usr/lib/syslinux/bios/gfxboot.c32 ${work_dir}/iso/isolinux/ -# cp ${work_dir}/root-image/usr/lib/syslinux/bios/whichsys.c32 ${work_dir}/iso/isolinux/ -# cp ${work_dir}/root-image/usr/lib/syslinux/bios/mboot.c32 ${work_dir}/iso/isolinux/ -# cp ${work_dir}/root-image/usr/lib/syslinux/bios/hdt.c32 ${work_dir}/iso/isolinux/ -# cp ${work_dir}/root-image/usr/lib/syslinux/bios/chain.c32 ${work_dir}/iso/isolinux/ -# cp ${work_dir}/root-image/usr/lib/syslinux/bios/libcom32.c32 ${work_dir}/iso/isolinux/ -# cp ${work_dir}/root-image/usr/lib/syslinux/bios/libmenu.c32 ${work_dir}/iso/isolinux/ -# cp ${work_dir}/root-image/usr/lib/syslinux/bios/libutil.c32 ${work_dir}/iso/isolinux/ -# cp ${work_dir}/root-image/usr/lib/syslinux/bios/libgpl.c32 ${work_dir}/iso/isolinux/ -# else -# cp ${work_dir}/root-image/usr/lib/syslinux/isolinux.bin ${work_dir}/iso/isolinux/ -# cp ${work_dir}/root-image/usr/lib/syslinux/isohdpfx.bin ${work_dir}/iso/isolinux/ -# cp ${work_dir}/root-image/usr/lib/syslinux/gfxboot.c32 ${work_dir}/iso/isolinux/ -# cp ${work_dir}/root-image/usr/lib/syslinux/whichsys.c32 ${work_dir}/iso/isolinux/ -# cp ${work_dir}/root-image/usr/lib/syslinux/mboot.c32 ${work_dir}/iso/isolinux/ -# cp ${work_dir}/root-image/usr/lib/syslinux/hdt.c32 ${work_dir}/iso/isolinux/ -# cp ${work_dir}/root-image/usr/lib/syslinux/chain.c32 ${work_dir}/iso/isolinux/ -# fi -# sed -i "s|%MISO_LABEL%|${iso_label}|g; -# s|%INSTALL_DIR%|${install_dir}|g; -# s|%ARCH%|${arch}|g" ${work_dir}/iso/isolinux/isolinux.cfg -# : > ${work_dir}/build.${FUNCNAME} -# msg "Done" -# fi -# } -# -# # Prepare overlay-image -# make_overlay() { -# if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then -# msg "Prepare overlay-image" -# mkdir -p ${work_dir}/overlay/etc/pacman.d -# -# cp -LPdr overlay-livecd/{etc,usr,var,root} ${work_dir}/overlay -# cp -Lr overlay-livecd/opt ${work_dir}/overlay -# -# #wget -O ${work_dir}/overlay/etc/pacman.d/mirrorlist http://git.manjaro.org/packages-sources/basis/blobs/raw/master/pacman-mirrorlist/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/^.*TITLE=.*/ TITLE=\"Manjaro Linux Installation Framework (v${iso_version})\"/g" ${work_dir}/overlay/opt/livecd/setup -# #chmod -R 755 ${work_dir}/overlay/home -# : > ${work_dir}/build.${FUNCNAME} -# msg "Done" -# fi -# } -# -# # Process isomounts -# make_isomounts() { -# if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then -# msg "Process isomounts" -# sed "s|@ARCH@|${arch}|g" isomounts > ${work_dir}/iso/${install_dir}/isomounts -# : > ${work_dir}/build.${FUNCNAME} -# msg "Done" -# fi -# } -# -# prepare_targetdir(){ -# mkdir -p "${target_dir}" -# } - display_settings(){ msg "manjaro-tools" msg2 "version: ${version}" @@ -234,247 +51,6 @@ display_settings(){ msg2 "iso_file: ${iso_file}" } -# clean_up(){ -# if [[ -d ${work_dir} ]];then -# msg "Removing work dir ${work_dir}" -# rm -r ${work_dir} -# fi -# } -# -# # Build ISO -# make_iso() { -# msg "Build ISO" -# touch "${work_dir}/iso/.miso" -# -# mkiso ${iso_args[*]} iso "${work_dir}" "${iso_file}" -# chown -R "${iso_owner}:users" "${target_dir}" -# msg "Done" -# } -# -# # Base installation (root-image) -# make_root_image() { -# if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then -# msg "Base installation (root-image)" -# mkiso ${create_args[*]} -p "${packages}" -i "root-image" create "${work_dir}" -# -# pacman -Qr "${work_dir}/root-image" > "${work_dir}/root-image/root-image-pkgs.txt" -# -# cp ${work_dir}/root-image/etc/locale.gen.bak ${work_dir}/root-image/etc/locale.gen -# if [ -e ${work_dir}/root-image/boot/grub/grub.cfg ] ; then -# rm ${work_dir}/root-image/boot/grub/grub.cfg -# fi -# if [ -e ${work_dir}/root-image/etc/plymouth/plymouthd.conf ] ; then -# sed -i -e "s/^.*Theme=.*/Theme=$plymouth_theme/" ${work_dir}/root-image/etc/plymouth/plymouthd.conf -# fi -# if [ -e ${work_dir}/root-image/etc/lsb-release ] ; then -# sed -i -e "s/^.*DISTRIB_RELEASE.*/DISTRIB_RELEASE=${iso_version}/" ${work_dir}/root-image/etc/lsb-release -# fi -# if [ -e ${work_dir}/root-image/usr/bin/cupsd ] ; then -# mkdir -p "${work_dir}/root-image/etc/systemd/system/multi-user.target.wants" -# ln -sf '/usr/lib/systemd/system/org.cups.cupsd.service' "${work_dir}/root-image/etc/systemd/system/multi-user.target.wants/org.cups.cupsd.service" -# fi -# if [ -e ${work_dir}/root-image/usr/bin/keyboardctl ] ; then -# mkdir -p "${work_dir}/root-image/etc/systemd/system/sysinit.target.wants" -# ln -sf '/usr/lib/systemd/system/keyboardctl.service' "${work_dir}/root-image/etc/systemd/system/sysinit.target.wants/keyboardctl.service" -# fi -# if [ -e ${work_dir}/root-image/usr/bin/tlp ] ; then -# mkdir -p "${work_dir}"/root-image/etc/systemd/system/{sleep.target.wants,multi-user.target.wants} -# ln -sf '/usr/lib/systemd/system/tlp-sleep.service' "${work_dir}/root-image/etc/systemd/system/sleep.target.wants/tlp-sleep.service" -# ln -sf '/usr/lib/systemd/system/tlp.service' "${work_dir}/root-image/etc/systemd/system/multi-user.target.wants/tlp.service" -# fi -# cp -LPr overlay/* ${work_dir}/root-image -# -# # Clean up GnuPG keys -# rm -rf "${work_dir}/root-image/etc/pacman.d/gnupg" -# -# # Change to given branch in options.conf -# sed -i -e "s/stable/$branch/" ${work_dir}/root-image/etc/pacman.d/mirrorlist -# sed -i -e "s/stable/$branch/" ${work_dir}/root-image/etc/pacman-mirrors.conf -# -# : > ${work_dir}/build.${FUNCNAME} -# msg "Done" -# fi -# } -# -# make_de_image() { -# if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then -# msg "${desktop} installation (${desktop}-image)" -# mkdir -p ${work_dir}/${desktop}-image -# if [ ! -z "$(mount -l | grep ${desktop}-image)" ]; then -# umount -l ${work_dir}/${desktop}-image -# fi -# mount -t aufs -o br=${work_dir}/${desktop}-image:${work_dir}/root-image=ro none ${work_dir}/${desktop}-image -# -# mkiso ${create_args[*]} -i "${desktop}-image" -p "${de_packages}" create "${work_dir}" -# -# pacman -Qr "${work_dir}/${desktop}-image" > "${work_dir}/${desktop}-image/${desktop}-image-pkgs.txt" -# cp "${work_dir}/${desktop}-image/${desktop}-image-pkgs.txt" ${target_dir}/${img_name}-${desktop}-${iso_version}-${arch}-pkgs.txt -# -# if [ -e ${desktop}-overlay ] ; then -# cp -LPr ${desktop}-overlay/* ${work_dir}/${desktop}-image -# fi -# if [ -e ${work_dir}/${desktop}-image/usr/bin/cupsd ] ; then -# mkdir -p "${work_dir}/${desktop}-image/etc/systemd/system/multi-user.target.wants" -# ln -sf '/usr/lib/systemd/system/org.cups.cupsd.service' "${work_dir}/${desktop}-image/etc/systemd/system/multi-user.target.wants/org.cups.cupsd.service" -# fi -# if [ -e ${work_dir}/root-image/usr/bin/tlp ] ; then -# mkdir -p "${work_dir}/${desktop}-image"/etc/systemd/system/{sleep.target.wants,multi-user.target.wants} -# ln -sf '/usr/lib/systemd/system/tlp-sleep.service' "${work_dir}/${desktop}-image/etc/systemd/system/sleep.target.wants/tlp-sleep.service" -# ln -sf '/usr/lib/systemd/system/tlp.service' "${work_dir}/${desktop}-image/etc/systemd/system/multi-user.target.wants/tlp.service" -# fi -# if [ -e ${work_dir}/${desktop}-image/etc/plymouth/plymouthd.conf ] ; then -# sed -i -e "s/^.*Theme=.*/Theme=$plymouth_theme/" ${work_dir}/${desktop}-image/etc/plymouth/plymouthd.conf -# fi -# -# # copy over manjaro-tools.conf -# copy_manjaro_tools_conf "${work_dir}/${desktop}-image" -# -# umount -l ${work_dir}/${desktop}-image -# rm -R ${work_dir}/${desktop}-image/.wh* -# : > ${work_dir}/build.${FUNCNAME} -# msg "Done" -# fi -# } -# -# copy_manjaro_tools_conf(){ -# local mtools=$1/etc/skel/.config -# -# [[ ! -d ${mtools} ]] && mkdir ${mtools} -# if [[ -f $USER_HOME/.config/manjaro-tools.conf ]]; then -# msg2 "Copying $USER_HOME/.config/manjaro-tools.conf ..." -# cp $USER_HOME/.config/manjaro-tools.conf ${mtools}/manjaro-tools.conf -# else -# msg2 "Copying ${manjaro_tools_conf} ..." -# cp ${manjaro_tools_conf} ${mtools}/manjaro-tools.conf -# fi -# } -# -# make_pkgs_image() { -# if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then -# msg "Prepare pkgs-image" -# mkdir -p ${work_dir}/pkgs-image/opt/livecd/pkgs -# if [ ! -z "$(mount -l | grep pkgs-image)" ]; then -# umount -l ${work_dir}/pkgs-image -# fi -# msg2 "mount root-image" -# mount -t aufs -o br=${work_dir}/pkgs-image:${work_dir}/root-image=ro none ${work_dir}/pkgs-image -# if [ ! -z "${desktop}" ] ; then -# msg2 -"mount ${desktop}-image" -# mount -t aufs -o remount,append:${work_dir}/${desktop}-image=ro none ${work_dir}/pkgs-image -# fi -# pacman -v --config "${pacman_conf}" --arch "${arch}" --root "${work_dir}/pkgs-image" --cache ${work_dir}/pkgs-image/opt/livecd/pkgs -Syw ${xorg_packages} --noconfirm -# if [ ! -z "${xorg_packages_cleanup}" ]; then -# for xorg_clean in ${xorg_packages_cleanup}; -# do rm ${work_dir}/pkgs-image/opt/livecd/pkgs/${xorg_clean} -# done -# fi -# cp pacman-gfx.conf ${work_dir}/pkgs-image/opt/livecd -# rm -r ${work_dir}/pkgs-image/var -# repo-add ${work_dir}/pkgs-image/opt/livecd/pkgs/gfx-pkgs.db.tar.gz ${work_dir}/pkgs-image/opt/livecd/pkgs/*pkg*z -# # Disable Catalyst if not present -# if [ -z "$(ls ${work_dir}/pkgs-image/opt/livecd/pkgs/ | grep catalyst-utils 2> /dev/null)" ]; then -# msg "Disabling Catalyst driver" -# mkdir -p ${work_dir}/pkgs-image/var/lib/mhwd/db/pci/graphic_drivers/catalyst/ -# touch ${work_dir}/pkgs-image/var/lib/mhwd/db/pci/graphic_drivers/catalyst/MHWDCONFIG -# fi -# # Disable Nvidia if not present -# if [ -z "$(ls ${work_dir}/pkgs-image/opt/livecd/pkgs/ | grep nvidia-utils 2> /dev/null)" ]; then -# msg "Disabling Nvidia driver" -# mkdir -p ${work_dir}/pkgs-image/var/lib/mhwd/db/pci/graphic_drivers/nvidia/ -# touch ${work_dir}/pkgs-image/var/lib/mhwd/db/pci/graphic_drivers/nvidia/MHWDCONFIG -# fi -# if [ -z "$(ls ${work_dir}/pkgs-image/opt/livecd/pkgs/ | grep nvidia-utils 2> /dev/null)" ]; then -# msg "Disabling Nvidia Bumblebee driver" -# mkdir -p ${work_dir}/pkgs-image/var/lib/mhwd/db/pci/graphic_drivers/hybrid-intel-nvidia-bumblebee/ -# touch ${work_dir}/pkgs-image/var/lib/mhwd/db/pci/graphic_drivers/hybrid-intel-nvidia-bumblebee/MHWDCONFIG -# fi -# if [ -z "$(ls ${work_dir}/pkgs-image/opt/livecd/pkgs/ | grep nvidia-304xx-utils 2> /dev/null)" ]; then -# msg "Disabling Nvidia 304xx driver" -# mkdir -p ${work_dir}/pkgs-image/var/lib/mhwd/db/pci/graphic_drivers/nvidia-304xx/ -# touch ${work_dir}/pkgs-image/var/lib/mhwd/db/pci/graphic_drivers/nvidia-304xx/MHWDCONFIG -# fi -# if [ -z "$(ls ${work_dir}/pkgs-image/opt/livecd/pkgs/ | grep nvidia-340xx-utils 2> /dev/null)" ]; then -# msg "Disabling Nvidia 340xx driver" -# mkdir -p ${work_dir}/pkgs-image/var/lib/mhwd/db/pci/graphic_drivers/nvidia-340xx/ -# touch ${work_dir}/pkgs-image/var/lib/mhwd/db/pci/graphic_drivers/nvidia-340xx/MHWDCONFIG -# fi -# umount -l ${work_dir}/pkgs-image -# rm -R ${work_dir}/pkgs-image/.wh* -# if ${xorg_overlays}; then -# msg2 "Prepare pkgs-free-overlay" -# mkdir -p ${work_dir}/pkgs-free-overlay -# if [ ! -z "$(mount -l | grep pkgs-free-overlay)" ]; then -# umount -l ${work_dir}/pkgs-free-overlay -# fi -# msg2 "mount root-image" -# mount -t aufs -o br=${work_dir}/pkgs-free-overlay:${work_dir}/root-image=ro none ${work_dir}/pkgs-free-overlay -# if [ ! -z "${desktop}" ] ; then -# msg2 "mount ${desktop}-image" -# mount -t aufs -o remount,append:${work_dir}/${desktop}-image=ro none ${work_dir}/pkgs-free-overlay -# fi -# mkiso ${create_args[*]} -i "pkgs-free-overlay" -p "${xorg_free_overlay}" create "${work_dir}" -# umount -l ${work_dir}/pkgs-free-overlay -# if [ -e ${work_dir}/pkgs-free-overlay/etc/modules-load.d/*virtualbox*conf ] ; then -# rm ${work_dir}/pkgs-free-overlay/etc/modules-load.d/*virtualbox*conf -# fi -# rm -R ${work_dir}/pkgs-free-overlay/.wh* -# msg2 "Prepare pkgs-nonfree-overlay" -# mkdir -p ${work_dir}/pkgs-nonfree-overlay -# if [ ! -z "$(mount -l | grep pkgs-nonfree-overlay)" ]; then -# umount -l ${work_dir}/pkgs-nonfree-overlay -# fi -# msg2 "mount root-image" -# mount -t aufs -o br=${work_dir}/pkgs-nonfree-overlay:${work_dir}/root-image=ro none ${work_dir}/pkgs-nonfree-overlay -# if [ ! -z "${desktop}" ] ; then -# msg2 "mount ${desktop}-image" -# mount -t aufs -o remount,append:${work_dir}/${desktop}-image=ro none ${work_dir}/pkgs-nonfree-overlay -# fi -# mkiso ${create_args[*]} -i "pkgs-nonfree-overlay" -p "${xorg_nonfree_overlay}" create "${work_dir}" -# umount -l ${work_dir}/pkgs-nonfree-overlay -# if [ -e ${work_dir}/pkgs-nonfree-overlay/etc/modules-load.d/*virtualbox*conf ] ; then -# rm ${work_dir}/pkgs-nonfree-overlay/etc/modules-load.d/*virtualbox*conf -# fi -# rm -R ${work_dir}/pkgs-nonfree-overlay/.wh* -# fi -# : > ${work_dir}/build.${FUNCNAME} -# msg "Done" -# fi -# } -# -# make_lng_image() { -# if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then -# msg "Prepare lng-image" -# mkdir -p ${work_dir}/lng-image/opt/livecd/lng -# if [ ! -z "$(mount -l | grep lng-image)" ]; then -# umount -l ${work_dir}/lng-image -# fi -# msg2 "mount root-image" -# mount -t aufs -o br=${work_dir}/lng-image:${work_dir}/root-image=ro none ${work_dir}/lng-image -# if [ ! -z "${desktop}" ] ; then -# msg2 "mount ${desktop}-image" -# mount -t aufs -o remount,append:${work_dir}/${desktop}-image=ro none ${work_dir}/lng-image -# fi -# if ${kde_lng_packages}; then -# pacman -v --config "${pacman_conf}" --arch "${arch}" --root "${work_dir}/lng-image" --cache ${work_dir}/lng-image/opt/livecd/lng -Syw ${lng_packages} ${lng_packages_kde} --noconfirm -# else -# pacman -v --config "${pacman_conf}" --arch "${arch}" --root "${work_dir}/lng-image" --cache ${work_dir}/lng-image/opt/livecd/lng -Syw ${lng_packages} --noconfirm -# fi -# if [ ! -z "${lng_packages_cleanup}" ]; then -# for lng_clean in ${lng_packages_cleanup}; -# do rm ${work_dir}/lng-image/opt/livecd/lng/${lng_clean} -# done -# fi -# cp pacman-lng.conf ${work_dir}/lng-image/opt/livecd -# rm -r ${work_dir}/lng-image/var -# repo-add ${work_dir}/lng-image/opt/livecd/lng/lng-pkgs.db.tar.gz ${work_dir}/lng-image/opt/livecd/lng/*pkg*z -# umount -l ${work_dir}/lng-image -# rm -R ${work_dir}/lng-image/.wh* -# : > ${work_dir}/build.${FUNCNAME} -# msg "Done" -# fi -# } - - iso_owner=${SUDO_USER:-$USER} if [[ -n $SUDO_USER ]]; then