updating all files

34 files changed, 671 insertions, 224 deletions

diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index 4a48b0a..8080d25 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -2,53 +2,41 @@
 
 set -e -u
 
-name=parabola
+iso_name=parabola
 iso_label="LIBRE_$(date +%Y%m)"
-version=$(date +%Y.%m.%d)
+iso_version=$(date +%Y.%m.%d)
 install_dir=libre
 arch=$(uname -m)
 work_dir=work
-verbose="n"
+out_dir=out
+verbose=""
+cmd_args=""
 
 script_path=$(readlink -f ${0%/*})
 
 # Base installation (root-image)
 make_basefs() {
-    mkarchiso ${verbose} -D "${install_dir}" -p "base" create "${work_dir}"
-    mkarchiso ${verbose} -D "${install_dir}" -p "memtest86+ syslinux mkinitcpio-nfs-utils nbd" create "${work_dir}"
+    mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" init
+    mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -p "memtest86+ mkinitcpio-nfs-utils nbd curl" install
 }
 
 # Additional packages (root-image)
 make_packages() {
-    mkarchiso ${verbose} -D "${install_dir}" -p "$(grep -v ^# ${script_path}/packages.${arch})" create "${work_dir}"
-}
-
-# Customize installation (root-image)
-make_customize_root_image() {
-    if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
-        cp -af ${script_path}/root-image ${work_dir}
-        chmod 750 ${work_dir}/root-image/etc/sudoers.d
-        chmod 440 ${work_dir}/root-image/etc/sudoers.d/g_wheel
-        mkdir -p ${work_dir}/root-image/etc/pacman.d
-        echo "Server = http://repo.parabolagnulinux.org/\$repo/os/\$arch" > \
-             ${work_dir}/root-image/etc/pacman.d/mirrorlist
-        chroot ${work_dir}/root-image /usr/sbin/locale-gen
-        chroot ${work_dir}/root-image /usr/sbin/useradd -m -p "" -g users -G "audio,disk,optical,wheel" libre 
-# Cleanup, makes the ISO lighter
-# Remove headers
-        rm -rf ${work_dir}/root-image/usr/include/*
-        : > ${work_dir}/build.${FUNCNAME}
-    fi
+    mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -p "$(grep -v ^# ${script_path}/packages.${arch})" install
 }
 
 # Copy mkinitcpio archiso hooks (root-image)
 make_setup_mkinitcpio() {
    if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
         local _hook
-        for _hook in archiso archiso_pxe_nbd archiso_loop_mnt; do
-            cp /lib/initcpio/hooks/${_hook} ${work_dir}/root-image/lib/initcpio/hooks
-            cp /lib/initcpio/install/${_hook} ${work_dir}/root-image/lib/initcpio/install
+        for _hook in archiso archiso_shutdown archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_loop_mnt; do
+            cp /usr/lib/initcpio/hooks/${_hook} ${work_dir}/root-image/usr/lib/initcpio/hooks
+            cp /usr/lib/initcpio/install/${_hook} ${work_dir}/root-image/usr/lib/initcpio/install
         done
+        cp /usr/lib/initcpio/install/archiso_kms ${work_dir}/root-image/usr/lib/initcpio/install
+        cp /usr/lib/initcpio/archiso_shutdown ${work_dir}/root-image/usr/lib/initcpio
+        cp /usr/lib/initcpio/archiso_pxe_nbd ${work_dir}/root-image/usr/lib/initcpio
+        cp ${script_path}/mkinitcpio.conf ${work_dir}/root-image/etc/mkinitcpio-libreiso.conf
         : > ${work_dir}/build.${FUNCNAME}
    fi
 }
@@ -59,11 +47,10 @@ make_boot() {
         local _src=${work_dir}/root-image
         local _dst_boot=${work_dir}/iso/${install_dir}/boot
         mkdir -p ${_dst_boot}/${arch}
-        mkinitcpio \
-            -c ${script_path}/mkinitcpio.conf \
-            -b ${_src} \
-            -k /boot/vmlinuz-linux-libre \
-            -g ${_dst_boot}/${arch}/libreiso.img
+        mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" \
+            -r 'mkinitcpio -c /etc/mkinitcpio-libreiso.conf -k /boot/vmlinuz-linux-libre -g /boot/archiso.img' \
+            run
+        mv ${_src}/boot/archiso.img ${_dst_boot}/${arch}/libreiso.img
         mv ${_src}/boot/vmlinuz-linux-libre ${_dst_boot}/${arch}/vmlinuz
         cp ${_src}/boot/memtest86+/memtest.bin ${_dst_boot}/memtest
         cp ${_src}/usr/share/licenses/common/GPL2/license.txt ${_dst_boot}/memtest.COPYING
@@ -71,15 +58,54 @@ make_boot() {
     fi
 }
 
+# Prepare EFI "El Torito" boot image (using Linux >= 3.3 EFI boot stub)
+make_boot_efi() {
+    if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
+        if [[ ${arch} == "x86_64" ]]; then
+            mkdir -p ${work_dir}/iso/EFI/archiso
+            dd of=${work_dir}/iso/EFI/archiso/efiboot.img bs=1 seek=20M count=0
+            mkfs.vfat ${work_dir}/iso/EFI/archiso/efiboot.img
+
+            mkdir -p ${work_dir}/efiboot
+            mount ${work_dir}/iso/EFI/archiso/efiboot.img ${work_dir}/efiboot
+
+            mkdir -p ${work_dir}/efiboot/EFI/archiso
+            cp ${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz ${work_dir}/efiboot/EFI/archiso/vmlinuz.efi
+            cp ${work_dir}/iso/${install_dir}/boot/x86_64/libreiso.img ${work_dir}/efiboot/EFI/archiso/libreiso.img
+
+            # There are plans to support command line options via a config file (not yet in linux-3.3)
+            #cp ${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz ${work_dir}/efiboot/EFI/boot/bootx64.efi
+            #cp ${work_dir}/iso/${install_dir}/boot/x86_64/libreiso.img ${work_dir}/efiboot/EFI/boot/linux-libre.img
+            #echo "archisolabel=${iso_label} initrd=\EFI\boot\linux-libre.img" | iconv -f ascii -t ucs2 > ${work_dir}/iso/EFI/boot/linux-libre.conf
+
+            # For now, provide an EFI-shell until 'linux-libre.conf' hits mainline.
+            mkdir -p ${work_dir}/efiboot/EFI/boot
+            # EFI Shell 2.0 for UEFI 2.3+ ( http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=UEFI_Shell )
+            #wget -O ${work_dir}/efiboot/EFI/boot/bootx64.efi https://edk2.svn.sourceforge.net/svnroot/edk2/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 )
+            wget -O ${work_dir}/efiboot/EFI/boot/bootx64.efi https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellBinPkg/FullShell/X64/Shell_Full.efi
+
+            # Add an EFI shell script for automatic boot if ESC-key is not pressed within 5 seconds timeout.
+            sed "s|%ARCHISO_LABEL%|${iso_label}|g;
+                 s|%INSTALL_DIR%|${install_dir}|g" ${script_path}/efiboot/EFI/boot/startup.nsh > ${work_dir}/efiboot/EFI/boot/startup.nsh
+
+            umount ${work_dir}/efiboot
+        fi
+        : > ${work_dir}/build.${FUNCNAME}
+    fi
+}
+
 # Prepare /${install_dir}/boot/syslinux
 make_syslinux() {
     if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
         local _src_syslinux=${work_dir}/root-image/usr/lib/syslinux
         local _dst_syslinux=${work_dir}/iso/${install_dir}/boot/syslinux
         mkdir -p ${_dst_syslinux}
-        sed "s|%ARCHISO_LABEL%|${iso_label}|g;
-            s|%INSTALL_DIR%|${install_dir}|g;
-            s|%ARCH%|${arch}|g" ${script_path}/syslinux/syslinux.cfg > ${_dst_syslinux}/syslinux.cfg
+        for _cfg in ${script_path}/syslinux/*.cfg; do
+            sed "s|%ARCHISO_LABEL%|${iso_label}|g;
+                 s|%INSTALL_DIR%|${install_dir}|g;
+                 s|%ARCH%|${arch}|g" ${_cfg} > ${_dst_syslinux}/${_cfg##*/}
+        done
         cp ${script_path}/syslinux/splash.png ${_dst_syslinux}
         cp ${_src_syslinux}/*.c32 ${_dst_syslinux}
         cp ${_src_syslinux}/*.com ${_dst_syslinux}
@@ -98,6 +124,27 @@ make_isolinux() {
         mkdir -p ${work_dir}/iso/isolinux
         sed "s|%INSTALL_DIR%|${install_dir}|g" ${script_path}/isolinux/isolinux.cfg > ${work_dir}/iso/isolinux/isolinux.cfg
         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/
+        : > ${work_dir}/build.${FUNCNAME}
+    fi
+}
+
+# Customize installation (root-image)
+make_customize_root_image() {
+    if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
+        cp -af ${script_path}/root-image ${work_dir}
+        chmod 750 ${work_dir}/root-image/etc/sudoers.d
+        chmod 440 ${work_dir}/root-image/etc/sudoers.d/g_wheel
+        mkdir -p ${work_dir}/root-image/etc/pacman.d
+        wget -O ${work_dir}/root-image/etc/pacman.d/mirrorlist https://parabolagnulinux.org/mirrorlist/all/
+        sed -i "s/#Server/Server/g" ${work_dir}/root-image/etc/pacman.d/mirrorlist
+        sed -i 's/#\(en_US\.UTF-8\)/\1/' ${work_dir}/root-image/etc/locale.gen
+        mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" \
+            -r 'locale-gen' \
+            run
+        mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" \
+            -r 'useradd -m -p "" -g users -G "audio,disk,optical,wheel" libre' \
+            run
         : > ${work_dir}/build.${FUNCNAME}
     fi
 }
@@ -122,28 +169,28 @@ make_usr_share() {
 # TODO add 'base' packages on [libre] 
 make_core_repo() {
     if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
-        local _url _urls _pkg_name _cached_pkg _dst
+        local _url _urls _pkg_name _cached_pkg _dst _pkgs
         mkdir -p ${work_dir}/repo-core-any
         mkdir -p ${work_dir}/repo-core-${arch}
-        pacman -Sy
-        _urls=$(pacman -Sddp $(comm -2 -3 <(pacman -Sql core | sort ) <(grep -v ^# ${script_path}/core.exclude.${arch} | sort)))
+        mkdir -p ${work_dir}/pacman.db/var/lib/pacman
+        pacman -Sy -r ${work_dir}/pacman.db
+        _pkgs=$(comm -2 -3 <(pacman -Sql -r ${work_dir}/pacman.db core | sort | sed 's@^@core/@') \
+                           <(grep -v ^# ${script_path}/core.exclude.${arch} | sort | sed 's@^@core/@'))
+        _urls=$(pacman -Sddp -r ${work_dir}/pacman.db ${_pkgs})
+        pacman -Swdd -r ${work_dir}/pacman.db --noprogressbar --noconfirm ${_pkgs}
         for _url in ${_urls}; do
             _pkg_name=${_url##*/}
             _cached_pkg=/var/cache/pacman/pkg/${_pkg_name}
             _dst=${work_dir}/repo-core-${arch}/${_pkg_name}
-            if [[ ! -e ${_dst} ]]; then
-                if [[ -e ${_cached_pkg} ]]; then
-                    cp -v "${_cached_pkg}" "${_dst}"
-                else
-                    wget -nv "${_url}" -O "${_dst}"
-                fi
-            fi
-            repo-add -q ${work_dir}/repo-core-${arch}/core.db.tar.gz ${work_dir}/repo-core-${arch}/${_pkg_name}
-            if [[ ${_pkg_name} =~ any.pkg ]]; then
-                mv "${_dst}" ${work_dir}/repo-core-any/${_pkg_name}
-                ln -sf ../any/${_pkg_name} ${work_dir}/repo-core-${arch}/${_pkg_name}
+            cp ${_cached_pkg} ${_dst}
+            repo-add -q ${work_dir}/repo-core-${arch}/core.db.tar.gz ${_dst}
+            if [[ ${_pkg_name} == *any.pkg.tar* ]]; then
+                mv ${_dst} ${work_dir}/repo-core-any/${_pkg_name}
+                ln -sf ../any/${_pkg_name} ${_dst}
             fi
         done
+        mkdir -p ${work_dir}/iso/${install_dir}
+        pacman -Sp -r ${work_dir}/pacman.db --print-format "%r/%n-%v" ${_pkgs} | sort > ${work_dir}/iso/${install_dir}/pkglist.repo-core.${arch}.txt
         : > ${work_dir}/build.${FUNCNAME}
     fi
 }
@@ -160,15 +207,16 @@ make_aitab() {
 
 # Build all filesystem images specified in aitab (.fs .fs.sfs .sfs)
 make_prepare() {
-    mkarchiso ${verbose} -D "${install_dir}" prepare "${work_dir}"
+    mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" pkglist
+    mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" prepare
 }
 
 # Build ISO
 # args: $1 (core | netinstall)
 make_iso() {
     local _iso_type=${1}
-    mkarchiso ${verbose} -D "${install_dir}" checksum "${work_dir}"
-    mkarchiso ${verbose} -D "${install_dir}" -L "${iso_label}" iso "${work_dir}" "${name}-${version}-${_iso_type}-${arch}.iso"
+    mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" checksum
+    mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-${_iso_type}-${arch}.iso"
 }
 
 # Build dual-iso images from ${work_dir}/i686/iso and ${work_dir}/x86_64/iso
@@ -192,7 +240,7 @@ make_dual() {
         cp -a -l -f ${_src_one} ${work_dir}/dual
         cp -a -l -n ${_src_two} ${work_dir}/dual
         rm -f ${work_dir}/dual/iso/${install_dir}/aitab
-        rm -f ${work_dir}/dual/iso/${install_dir}/boot/syslinux/syslinux.cfg
+        rm -f ${work_dir}/dual/iso/${install_dir}/boot/syslinux/*.cfg
         if [[ ${_iso_type} == "core" ]]; then
             if [[ ! -e ${work_dir}/dual/iso/${install_dir}/any/repo-core-any.sfs ||
                   ! -e ${work_dir}/dual/iso/${install_dir}/i686/repo-core-i686.sfs ||
@@ -204,6 +252,8 @@ make_dual() {
             rm -f ${work_dir}/dual/iso/${install_dir}/any/repo-core-any.sfs
             rm -f ${work_dir}/dual/iso/${install_dir}/i686/repo-core-i686.sfs
             rm -f ${work_dir}/dual/iso/${install_dir}/x86_64/repo-core-x86_64.sfs
+            rm -f ${work_dir}/dual/iso/${install_dir}/pkglist.repo-core.i686.txt
+            rm -f ${work_dir}/dual/iso/${install_dir}/pkglist.repo-core.x86_64.txt
         fi
         paste -d"\n" <(sed "s|%ARCH%|i686|g" ${script_path}/aitab.${_iso_type}) \
                      <(sed "s|%ARCH%|x86_64|g" ${script_path}/aitab.${_iso_type}) | uniq > ${work_dir}/dual/iso/${install_dir}/aitab
@@ -211,19 +261,89 @@ make_dual() {
             sed "s|%ARCHISO_LABEL%|${iso_label}|g;
                  s|%INSTALL_DIR%|${install_dir}|g" ${_cfg} > ${work_dir}/dual/iso/${install_dir}/boot/syslinux/${_cfg##*/}
         done
-        mkarchiso ${verbose} -D "${install_dir}" checksum "${work_dir}/dual"
-        mkarchiso ${verbose} -D "${install_dir}" -L "${iso_label}" iso "${work_dir}/dual" "${name}-${version}-${_iso_type}-dual.iso"
+        mkarchiso ${verbose} -w "${work_dir}/dual" -D "${install_dir}" checksum
+        mkarchiso ${verbose} -w "${work_dir}/dual" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-${_iso_type}-dual.iso"
         : > ${work_dir}/dual/build.${FUNCNAME}_${_iso_type}
     fi
 }
 
+purge_single ()
+{
+    if [[ -d ${work_dir} ]]; then
+        find ${work_dir} -mindepth 1 -maxdepth 1 \
+            ! -path ${work_dir}/iso -prune \
+            | xargs rm -rf
+    fi
+}
+
+purge_dual ()
+{
+    if [[ -d ${work_dir}/dual ]]; then
+        find ${work_dir}/dual -mindepth 1 -maxdepth 1 \
+            ! -path ${work_dir}/dual/iso -prune \
+            | xargs rm -rf
+    fi
+}
+
+clean_single ()
+{
+    rm -rf ${work_dir}
+    rm -f ${out_dir}/${iso_name}-${iso_version}-*-${arch}.iso
+}
+
+clean_dual ()
+{
+    rm -rf ${work_dir}/dual
+    rm -f ${out_dir}/${iso_name}-${iso_version}-*-dual.iso
+}
 
+make_common_single() {
+    make_basefs
+    make_packages
+    make_setup_mkinitcpio
+    make_boot
+    make_boot_efi
+    make_syslinux
+    make_isolinux
+    make_customize_root_image
+    make_lib_modules
+    make_usr_share
+    make_aitab $1
+    make_prepare $1
+    make_iso $1
+}
 
 _usage ()
 {
-    echo "usage ${0##*/} net_iso_single | core_iso_single | all_iso_single | purge_single | clean_single"
-    echo "               net_iso_dual   | core_iso_dual   | all_iso_dual   | purge_dual   | clean_dual"
+    echo "usage ${0} [options] command <command options>"
+    echo
+    echo " General options:"
+    echo "    -N <iso_name>      Set an iso filename (prefix)"
+    echo "                        Default: ${iso_name}"
+    echo "    -V <iso_version>   Set an iso version (in filename)"
+    echo "                        Default: ${iso_version}"
+    echo "    -L <iso_label>     Set an iso label (disk label)"
+    echo "                        Default: ${iso_label}"
+    echo "    -D <install_dir>   Set an install_dir (directory inside iso)"
+    echo "                        Default: ${install_dir}"
+    echo "    -w <work_dir>      Set the working directory"
+    echo "                        Default: ${work_dir}"
+    echo "    -o <out_dir>       Set the output directory"
+    echo "                        Default: ${out_dir}"
+    echo "    -v                 Enable verbose output"
+    echo "    -h                 This help message"
     echo
+    echo " Commands:"
+    echo "   build <mode> <type>"
+    echo "      Build selected .iso by <mode> and <type>"
+    echo "   purge <mode>"
+    echo "      Clean working directory except iso/ directory of build <mode>"
+    echo "   clean <mode>"
+    echo "      Clean working directory and .iso file in output directory of build <mode>"
+    echo
+    echo " Command options:"
+    echo "         <mode> Valid values 'single', 'dual' or 'all'"
+    echo "         <type> Valid values 'netinstall', 'core' or 'all'"
     exit ${1}
 }
 
@@ -232,81 +352,175 @@ if [[ ${EUID} -ne 0 ]]; then
     _usage 1
 fi
 
+while getopts 'N:V:L:D:w:o:vh' arg; do
+    case "${arg}" in
+        N)
+            iso_name="${OPTARG}"
+            cmd_args+=" -N ${iso_name}"
+            ;;
+        V)
+            iso_version="${OPTARG}"
+            cmd_args+=" -V ${iso_version}"
+            ;;
+        L)
+            iso_label="${OPTARG}"
+            cmd_args+=" -L ${iso_label}"
+            ;;
+        D)
+            install_dir="${OPTARG}"
+            cmd_args+=" -D ${install_dir}"
+            ;;
+        w)
+            work_dir="${OPTARG}"
+            cmd_args+=" -w ${work_dir}"
+            ;;
+        o)
+            out_dir="${OPTARG}"
+            cmd_args+=" -o ${out_dir}"
+            ;;
+        v)
+            verbose="-v"
+            cmd_args+=" -v"
+            ;;
+        h|?) _usage 0 ;;
+        *)
+            _msg_error "Invalid argument '${arg}'" 0
+            _usage 1
+            ;;
+    esac
+done
+
+shift $((OPTIND - 1))
+
 if [[ $# -lt 1 ]]; then
     echo "No command specified"
     _usage 1
 fi
 command_name="${1}"
 
-if [[ ${verbose} == "y" ]]; then
-    verbose="-v"
-else
-    verbose=""
+if [[ $# -lt 2 ]]; then
+    echo "No command mode specified"
+    _usage 1
 fi
+command_mode="${2}"
 
-if [[ ${command_name} =~ single ]]; then
-    work_dir=${work_dir}/${arch}
+if [[ ${command_name} == "build" ]]; then
+    if [[ $# -lt 3 ]]; then
+        echo "No build type specified"
+        _usage 1
+    fi
+command_type="${3}"
 fi
 
-make_common_single() {
-    make_basefs
-    make_packages
-    make_customize_root_image
-    make_setup_mkinitcpio
-    make_boot
-    make_syslinux
-    make_isolinux
-    make_lib_modules
-    make_usr_share
-    make_aitab $1
-    make_prepare $1
-    make_iso $1
-}
+if [[ ${command_mode} == "all" && ${arch} != "x86_64" ]]; then
+    echo "This mode <all> needs to be run on x86_64"
+    _usage 1
+fi
+
+if [[ ${command_mode} == "single" ]]; then
+    work_dir=${work_dir}/${arch}
+fi
 
 case "${command_name}" in
-    net_iso_single)
-        make_common_single netinstall
-        ;;
-    core_iso_single)
-        make_core_repo
-        make_common_single core
-        ;;
-    all_iso_single)
-        make_common_single netinstall
-        make_core_repo
-        make_common_single core
-        ;;
-    net_iso_dual)
-        make_dual netinstall
-        ;;
-    core_iso_dual)
-        make_dual core
-        ;;
-    all_iso_dual)
-        make_dual netinstall
-        make_dual core
-        ;;
-    purge_single)
-        if [[ -d ${work_dir} ]]; then
-            find ${work_dir} -mindepth 1 -maxdepth 1 \
-                ! -path ${work_dir}/iso -prune \
-                | xargs rm -rf
-        fi
-        ;;
-    purge_dual)
-        if [[ -d ${work_dir}/dual ]]; then
-            find ${work_dir}/dual -mindepth 1 -maxdepth 1 \
-                ! -path ${work_dir}/dual/iso -prune \
-                | xargs rm -rf
-        fi
+    build)
+        case "${command_mode}" in
+            single)
+                case "${command_type}" in
+                    netinstall)
+                        make_common_single netinstall
+                        ;;
+                    core)
+                        make_core_repo
+                        make_common_single core
+                        ;;
+                    all)
+                        make_common_single netinstall
+                        make_core_repo
+                        make_common_single core
+                        ;;
+                    *)
+                        echo "Invalid build type '${command_type}'"
+                        _usage 1
+                        ;;
+                esac
+                ;;
+            dual)
+                case "${command_type}" in
+                    netinstall)
+                        make_dual netinstall
+                        ;;
+                    core)
+                        make_dual core
+                        ;;
+                    all)
+                        make_dual netinstall
+                        make_dual core
+                        ;;
+                    *)
+                        echo "Invalid build type '${command_type}'"
+                        _usage 1
+                        ;;
+                esac
+                ;;
+            all)
+                case "${command_type}" in
+                    netinstall|core|all)
+                        $0 ${cmd_args} build single ${command_type}
+                        $0 ${cmd_args} purge single
+                        linux32 $0 ${cmd_args} build single ${command_type}
+                        linux32 $0 ${cmd_args} purge single
+                        $0 ${cmd_args} build dual ${command_type}
+                        $0 ${cmd_args} purge dual
+                        ;;
+                    *)
+                        echo "Invalid build type '${command_type}'"
+                        _usage 1
+                        ;;
+                esac
+                ;;
+            *)
+                echo "Invalid build mode '${command_mode}'"
+                _usage 1
+                ;;
+        esac
         ;;
-    clean_single)
-        rm -rf ${work_dir}
-        rm -f ${name}-${version}-*-${arch}.iso
+    purge)
+        case "${command_mode}" in
+            single)
+                purge_single
+                ;;
+            dual)
+                purge_dual
+                ;;
+            all)
+                $0 ${cmd_args} purge single
+                linux32 $0 ${cmd_args} purge single
+                $0 ${cmd_args} purge dual
+                ;;
+            *)
+                echo "Invalid purge mode '${command_mode}'"
+                _usage 1
+                ;;
+        esac
         ;;
-    clean_dual)
-        rm -rf ${work_dir}/dual
-        rm -f ${name}-${version}-*-dual.iso
+    clean)
+        case "${command_mode}" in
+            single)
+                clean_single
+                ;;
+            dual)
+                clean_dual
+                ;;
+            all)
+                $0 ${cmd_args} clean single
+                linux32 $0 ${cmd_args} clean single
+                $0 ${cmd_args} clean dual
+                ;;
+            *)
+                echo "Invalid clean mode '${command_mode}'"
+                _usage 1
+                ;;
+        esac
         ;;
     *)
         echo "Invalid command name '${command_name}'"
diff --git a/configs/releng/efiboot/EFI/boot/startup.nsh b/configs/releng/efiboot/EFI/boot/startup.nsh
new file mode 100644
index 0000000..1433751
--- /dev/null
+++ b/configs/releng/efiboot/EFI/boot/startup.nsh
@@ -0,0 +1,10 @@
+@echo -off
+
+for %m run (0 9)
+    if exist fs%m:\EFI\archiso\vmlinuz.efi then
+        fs%m:
+        cd fs%m:\EFI\archiso
+        echo "Launching Parabola GNU/Linux-libre ISO Kernel fs%m:\EFI\archiso\vmlinuz.efi"
+        vmlinuz.efi archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% initrd=\EFI\archiso\libreiso.img
+    endif
+endfor
diff --git a/configs/releng/isolinux/isolinux.cfg b/configs/releng/isolinux/isolinux.cfg
index e7bbaa4..1040d3f 100644
--- a/configs/releng/isolinux/isolinux.cfg
+++ b/configs/releng/isolinux/isolinux.cfg
@@ -1,5 +1,5 @@
 DEFAULT loadconfig
 
 LABEL loadconfig
-  CONFIG /%INSTALL_DIR%/boot/syslinux/syslinux.cfg
-  APPEND /%INSTALL_DIR%/boot/syslinux/
+  CONFIG /%INSTALL_DIR%/boot/syslinux/archiso.cfg
+  APPEND /%INSTALL_DIR%/
diff --git a/configs/releng/mkinitcpio.conf b/configs/releng/mkinitcpio.conf
index df833eb..12a656d 100644
--- a/configs/releng/mkinitcpio.conf
+++ b/configs/releng/mkinitcpio.conf
@@ -1,2 +1,2 @@
-HOOKS="base udev memdisk archiso archiso_pxe_nbd archiso_loop_mnt pata scsi sata usb fw pcmcia filesystems usbinput"
+HOOKS="base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms pata scsi sata virtio usb fw pcmcia filesystems usbinput"
 COMPRESSION="xz"
diff --git a/configs/releng/packages.i686 b/configs/releng/packages.i686
index 197dff3..109fb17 100644
--- a/configs/releng/packages.i686
+++ b/configs/releng/packages.i686
@@ -1,7 +1,7 @@
-aif
-btrfs-progs-unstable
+aif-libre
+btrfs-progs
 crda
-curl
+darkhttpd
 ddrescue
 dhclient
 dialog
@@ -9,10 +9,11 @@ dmraid
 dnsmasq
 dnsutils
 dosfstools
+efibootmgr
 elinks
 gnu-netcat
+gptfdisk
 hdparm
-inetutils
 irssi
 lftp
 lilo
@@ -37,4 +38,3 @@ tcpdump
 vpnc
 wireless_tools
 wpa_actiond
-zile
diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64
index 197dff3..109fb17 100644
--- a/configs/releng/packages.x86_64
+++ b/configs/releng/packages.x86_64
@@ -1,7 +1,7 @@
-aif
-btrfs-progs-unstable
+aif-libre
+btrfs-progs
 crda
-curl
+darkhttpd
 ddrescue
 dhclient
 dialog
@@ -9,10 +9,11 @@ dmraid
 dnsmasq
 dnsutils
 dosfstools
+efibootmgr
 elinks
 gnu-netcat
+gptfdisk
 hdparm
-inetutils
 irssi
 lftp
 lilo
@@ -37,4 +38,3 @@ tcpdump
 vpnc
 wireless_tools
 wpa_actiond
-zile
diff --git a/configs/releng/root-image/etc/hosts b/configs/releng/root-image/etc/hosts
index f26c713..ddb2a52 100644
--- a/configs/releng/root-image/etc/hosts
+++ b/configs/releng/root-image/etc/hosts
@@ -3,7 +3,7 @@
 #
 
 #<ip-address>	<hostname.domain.org>	<hostname>
-127.0.0.1		localhost.localdomain	localhost	libreiso
-::1				localhost.localdomain	localhost	libreiso
+127.0.0.1	localhost.localdomain	localhost	libreiso
+::1		localhost.localdomain	localhost	libreiso
 
 # End of file
diff --git a/configs/releng/root-image/etc/issue b/configs/releng/root-image/etc/issue
index 2e5b032..181b704 100644
--- a/configs/releng/root-image/etc/issue
+++ b/configs/releng/root-image/etc/issue
@@ -2,4 +2,4 @@
 Parabola GNU/Linux-libre Live ISO (\l)
 \s-\r \m.
 Default logins "root" and "libre" have no password.
-To begin installation, login as root.
+To begin installation, login as root
diff --git a/configs/releng/root-image/etc/motd b/configs/releng/root-image/etc/motd
index 0943569..af615af 100644
--- a/configs/releng/root-image/etc/motd
+++ b/configs/releng/root-image/etc/motd
@@ -9,7 +9,4 @@
 * If you encounter issues and want to report them or         *
 * seek help, run /libre/report-issues                        *
 *                                                            *
-* If you need help please consult                            *
-* http://wiki.parabolagnulinux.org                           *
-*                                                            *
 **************************************************************
diff --git a/configs/releng/root-image/etc/rc.conf b/configs/releng/root-image/etc/rc.conf
index f34f828..750f47f 100644
--- a/configs/releng/root-image/etc/rc.conf
+++ b/configs/releng/root-image/etc/rc.conf
@@ -1,5 +1,5 @@
 #
-# /etc/rc.conf - Main Configuration for Parabola GNU/Linux-libre
+# /etc/rc.conf - Main Configuration for Parabola GNU/Linux-Libre
 
 . /etc/archiso/functions
 
@@ -30,4 +30,4 @@ USELVM="no"
 
 HOSTNAME="libreiso"
 
-DAEMONS=(hwclock syslog-ng)
+DAEMONS=(hwclock metalog)
diff --git a/configs/releng/root-image/etc/rc.d/functions.d/automated_script b/configs/releng/root-image/etc/rc.d/functions.d/automated_script
index 7a35acb..b89ad9e 100644
--- a/configs/releng/root-image/etc/rc.d/functions.d/automated_script
+++ b/configs/releng/root-image/etc/rc.d/functions.d/automated_script
@@ -1,16 +1,16 @@
 automated_script ()
 {
     script="$(kernel_cmdline script)"
-    if [[ -n "$script" ]]; then
+    if [[ -n "${script}" ]]; then
         stat_busy "Configuring $script"
-        if [[ "$script" =~ ^http:// || "$script" =~ ^ftp:// ]]; then
-            wget "$script" -q -O /tmp/startup_script >/dev/null
+        if [[ "${script}" =~ ^http:// || "${script}" =~ ^ftp:// ]]; then
+            wget "${script}" -q -O /tmp/startup_script >/dev/null
             rt=$?
         else
-            cp "$script" /tmp/startup_script
+            cp "${script}" /tmp/startup_script
             rt=$?
         fi
-        if [ $rt -eq 0 ]; then
+        if [ ${rt} -eq 0 ]; then
             chmod +x /tmp/startup_script
             echo -e '\nif [ $(tty) = "/dev/tty1" ]; then\n    /tmp/startup_script\nfi\n' >> /root/.bash_profile
             stat_done
diff --git a/configs/releng/root-image/etc/rc.d/functions.d/symlink_used_block_devices b/configs/releng/root-image/etc/rc.d/functions.d/symlink_used_block_devices
new file mode 100644
index 0000000..f6b6062
--- /dev/null
+++ b/configs/releng/root-image/etc/rc.d/functions.d/symlink_used_block_devices
@@ -0,0 +1,7 @@
+symlink_used_block_devices()
+{
+    mkdir /run/aif
+    ln -s /run/archiso/used_block_devices /run/aif/ignore_block_devices
+}
+
+add_hook multi_end symlink_used_block_devices
diff --git a/configs/releng/syslinux.dual/archiso.cfg b/configs/releng/syslinux.dual/archiso.cfg
new file mode 100644
index 0000000..d1817af
--- /dev/null
+++ b/configs/releng/syslinux.dual/archiso.cfg
@@ -0,0 +1,11 @@
+DEFAULT select
+
+LABEL select
+COM32 boot/syslinux/whichsys.c32
+APPEND -pxe- pxe -sys- sys -iso- sys
+
+LABEL pxe
+CONFIG boot/syslinux/archiso_pxe_choose.cfg
+
+LABEL sys
+CONFIG boot/syslinux/archiso_sys_choose.cfg
diff --git a/configs/releng/syslinux.dual/archiso_head.cfg b/configs/releng/syslinux.dual/archiso_head.cfg
new file mode 100644
index 0000000..e643f2d
--- /dev/null
+++ b/configs/releng/syslinux.dual/archiso_head.cfg
@@ -0,0 +1,25 @@
+SERIAL 0 38400
+UI boot/syslinux/vesamenu.c32
+MENU TITLE Parabola GNU/Linux-libre
+MENU BACKGROUND boot/syslinux/splash.png
+
+MENU WIDTH 78
+MENU MARGIN 4
+MENU ROWS 5
+MENU VSHIFT 10
+MENU TABMSGROW 13
+MENU CMDLINEROW 11
+MENU HELPMSGROW 16
+MENU HELPMSGENDROW 29
+
+# Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu
+
+MENU COLOR border       30;44   #40ffffff #a0000000 std
+MENU COLOR title        1;36;44 #9033ccff #a0000000 std
+MENU COLOR sel          7;37;40 #e0ffffff #20ffffff all
+MENU COLOR unsel        37;44   #50ffffff #a0000000 std
+MENU COLOR help         37;40   #c0ffffff #a0000000 std
+MENU COLOR timeout_msg  37;40   #80ffffff #00000000 std
+MENU COLOR timeout      1;37;40 #c0ffffff #00000000 std
+MENU COLOR msg07        37;40   #90ffffff #a0000000 std
+MENU COLOR tabmsg       31;40   #30ffffff #00000000 std
diff --git a/configs/releng/syslinux.dual/archiso_pxe32.cfg b/configs/releng/syslinux.dual/archiso_pxe32.cfg
new file mode 100644
index 0000000..3700987
--- /dev/null
+++ b/configs/releng/syslinux.dual/archiso_pxe32.cfg
@@ -0,0 +1,32 @@
+LABEL arch32_nbd
+TEXT HELP
+Boot the Parabola GNU/Linux-libre (i686) live medium (Using NBD). It allows you to
+install a libre Arch Linux or perform system maintenance.
+ENDTEXT
+MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NBD)
+LINUX boot/i686/vmlinuz
+INITRD boot/i686/libreiso.img
+APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver}
+IPAPPEND 3
+
+LABEL arch32_nfs
+TEXT HELP
+Boot the Parabola GNU/Linux-libre (i686) live medium (Using NFS). It allows you to
+install a libre Arch Linux or perform system maintenance.
+ENDTEXT
+MENU LABEL Boot Parabola GNU/Linux-libre (i686) (NFS)
+LINUX boot/i686/vmlinuz
+INITRD boot/i686/libreiso.img
+APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt
+IPAPPEND 3
+
+LABEL arch32_http
+TEXT HELP
+Boot the Parabola GNU/Linux-libre (i686) live medium (Using HTTP). It allows you to
+install a libre Arch Linux or perform system maintenance.
+ENDTEXT
+MENU LABEL Boot Parabola GNU/Linux-libre (i686) (HTTP)
+LINUX boot/i686/vmlinuz
+INITRD boot/i686/libreiso.img
+APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/
+IPAPPEND 3
diff --git a/configs/releng/syslinux.dual/archiso_pxe64.cfg b/configs/releng/syslinux.dual/archiso_pxe64.cfg
new file mode 100644
index 0000000..cfb8371
--- /dev/null
+++ b/configs/releng/syslinux.dual/archiso_pxe64.cfg
@@ -0,0 +1,32 @@
+LABEL arch64_nbd
+TEXT HELP
+Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using NBD). It allows you to
+install a libre Arch Linux or perform system maintenance.
+ENDTEXT
+MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NBD)
+LINUX boot/x86_64/vmlinuz
+INITRD boot/x86_64/libreiso.img
+APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver}
+IPAPPEND 3
+
+LABEL arch64_nfs
+TEXT HELP
+Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using NFS). It allows you to
+install a libre Arch Linux or perform system maintenance.
+ENDTEXT
+MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (NFS)
+LINUX boot/x86_64/vmlinuz
+INITRD boot/x86_64/libreiso.img
+APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt
+IPAPPEND 3
+
+LABEL arch64_http
+TEXT HELP
+Boot the Parabola GNU/Linux-libre (x86_64) live medium (Using HTTP). It allows you to
+install a libre Arch Linux or perform system maintenance.
+ENDTEXT
+MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) (HTTP)
+LINUX boot/x86_64/vmlinuz
+INITRD boot/x86_64/libreiso.img
+APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/
+IPAPPEND 3
diff --git a/configs/releng/syslinux.dual/archiso_pxe_32_inc.cfg b/configs/releng/syslinux.dual/archiso_pxe_32_inc.cfg
new file mode 100644
index 0000000..e4115df
--- /dev/null
+++ b/configs/releng/syslinux.dual/archiso_pxe_32_inc.cfg
@@ -0,0 +1,3 @@
+INCLUDE boot/syslinux/archiso_head.cfg
+INCLUDE boot/syslinux/archiso_pxe32.cfg
+INCLUDE boot/syslinux/archiso_tail.cfg
diff --git a/configs/releng/syslinux.dual/archiso_pxe_both_inc.cfg b/configs/releng/syslinux.dual/archiso_pxe_both_inc.cfg
new file mode 100644
index 0000000..324523e
--- /dev/null
+++ b/configs/releng/syslinux.dual/archiso_pxe_both_inc.cfg
@@ -0,0 +1,4 @@
+INCLUDE boot/syslinux/archiso_head.cfg
+INCLUDE boot/syslinux/archiso_pxe32.cfg
+INCLUDE boot/syslinux/archiso_pxe64.cfg
+INCLUDE boot/syslinux/archiso_tail.cfg
diff --git a/configs/releng/syslinux.dual/archiso_pxe_choose.cfg b/configs/releng/syslinux.dual/archiso_pxe_choose.cfg
new file mode 100644
index 0000000..6296065
--- /dev/null
+++ b/configs/releng/syslinux.dual/archiso_pxe_choose.cfg
@@ -0,0 +1,11 @@
+DEFAULT choose
+
+LABEL choose
+COM32 boot/syslinux/ifcpu64.c32
+APPEND have64 -- nohave64
+
+LABEL have64
+CONFIG boot/syslinux/archiso_pxe_both_inc.cfg
+
+LABEL nohave64
+CONFIG boot/syslinux/archiso_pxe_32_inc.cfg
diff --git a/configs/releng/syslinux.dual/archiso_sys32.cfg b/configs/releng/syslinux.dual/archiso_sys32.cfg
new file mode 100644
index 0000000..cf66e23
--- /dev/null
+++ b/configs/releng/syslinux.dual/archiso_sys32.cfg
@@ -0,0 +1,9 @@
+LABEL arch32
+TEXT HELP
+Boot the Parabola GNU/Linux-libre (i686) live medium. It allows you to
+install a libre Arch Linux or perform system maintenance.
+ENDTEXT
+MENU LABEL Boot Parabola GNU/Linux-libre (i686)
+LINUX boot/i686/vmlinuz
+INITRD boot/i686/libreiso.img
+APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
diff --git a/configs/releng/syslinux.dual/archiso_sys64.cfg b/configs/releng/syslinux.dual/archiso_sys64.cfg
new file mode 100644
index 0000000..cc7490e
--- /dev/null
+++ b/configs/releng/syslinux.dual/archiso_sys64.cfg
@@ -0,0 +1,9 @@
+LABEL arch64
+TEXT HELP
+Boot the Parabola GNU/Linux-libre (x86_64) live medium. It allows you to
+install a libre Arch Linux or perform system maintenance.
+ENDTEXT
+MENU LABEL Boot Parabola GNU/Linux-libre (x86_64)
+LINUX boot/x86_64/vmlinuz
+INITRD boot/x86_64/libreiso.img
+APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
diff --git a/configs/releng/syslinux.dual/archiso_sys_32_inc.cfg b/configs/releng/syslinux.dual/archiso_sys_32_inc.cfg
new file mode 100644
index 0000000..9e37093
--- /dev/null
+++ b/configs/releng/syslinux.dual/archiso_sys_32_inc.cfg
@@ -0,0 +1,3 @@
+INCLUDE boot/syslinux/archiso_head.cfg
+INCLUDE boot/syslinux/archiso_sys32.cfg
+INCLUDE boot/syslinux/archiso_tail.cfg
diff --git a/configs/releng/syslinux.dual/archiso_sys_both_inc.cfg b/configs/releng/syslinux.dual/archiso_sys_both_inc.cfg
new file mode 100644
index 0000000..4ed6b39
--- /dev/null
+++ b/configs/releng/syslinux.dual/archiso_sys_both_inc.cfg
@@ -0,0 +1,4 @@
+INCLUDE boot/syslinux/archiso_head.cfg
+INCLUDE boot/syslinux/archiso_sys32.cfg
+INCLUDE boot/syslinux/archiso_sys64.cfg
+INCLUDE boot/syslinux/archiso_tail.cfg
diff --git a/configs/releng/syslinux.dual/archiso_sys_choose.cfg b/configs/releng/syslinux.dual/archiso_sys_choose.cfg
new file mode 100644
index 0000000..24c597a
--- /dev/null
+++ b/configs/releng/syslinux.dual/archiso_sys_choose.cfg
@@ -0,0 +1,11 @@
+DEFAULT choose
+
+LABEL choose
+COM32 boot/syslinux/ifcpu64.c32
+APPEND have64 -- nohave64
+
+LABEL have64
+CONFIG boot/syslinux/archiso_sys_both_inc.cfg
+
+LABEL nohave64
+CONFIG boot/syslinux/archiso_sys_32_inc.cfg
diff --git a/configs/releng/syslinux.dual/archiso_tail.cfg b/configs/releng/syslinux.dual/archiso_tail.cfg
new file mode 100644
index 0000000..a55548c
--- /dev/null
+++ b/configs/releng/syslinux.dual/archiso_tail.cfg
@@ -0,0 +1,27 @@
+LABEL existing
+TEXT HELP
+Boot an existing operating system. Press TAB to edit the disk and partition
+number to boot.
+ENDTEXT
+MENU LABEL Boot existing OS
+COM32 boot/syslinux/chain.c32
+APPEND hd0 0
+
+# http://www.memtest.org/
+LABEL memtest
+MENU LABEL Run Memtest86+ (RAM test)
+LINUX boot/memtest
+
+# http://hdt-project.org/
+LABEL hdt
+MENU LABEL Hardware Information (HDT)
+COM32 boot/syslinux/hdt.c32
+APPEND modules_alias=boot/syslinux/hdt/modalias.gz pciids=boot/syslinux/hdt/pciids.gz
+
+LABEL reboot
+MENU LABEL Reboot
+COM32 boot/syslinux/reboot.c32
+
+LABEL poweroff
+MENU LABEL Power Off
+COMBOOT boot/syslinux/poweroff.com
diff --git a/configs/releng/syslinux.dual/syslinux.cfg b/configs/releng/syslinux.dual/syslinux.cfg
index ac92998..3ee98de 100644
--- a/configs/releng/syslinux.dual/syslinux.cfg
+++ b/configs/releng/syslinux.dual/syslinux.cfg
@@ -1,12 +1,5 @@
-DEFAULT choose
-PROMPT 0
+DEFAULT loadconfig
 
-LABEL choose
-KERNEL ifcpu64.c32
-APPEND have64 -- nohave64
-
-LABEL have64
-CONFIG syslinux_both.cfg
-
-LABEL nohave64
-CONFIG syslinux_32only.cfg
+LABEL loadconfig
+  CONFIG archiso.cfg
+  APPEND ../../
diff --git a/configs/releng/syslinux/archiso.cfg b/configs/releng/syslinux/archiso.cfg
new file mode 100644
index 0000000..126fc77
--- /dev/null
+++ b/configs/releng/syslinux/archiso.cfg
@@ -0,0 +1,11 @@
+DEFAULT select
+
+LABEL select
+COM32 boot/syslinux/whichsys.c32
+APPEND -pxe- pxe -sys- sys -iso- sys
+
+LABEL pxe
+CONFIG boot/syslinux/archiso_pxe_inc.cfg
+
+LABEL sys
+CONFIG boot/syslinux/archiso_sys_inc.cfg
diff --git a/configs/releng/syslinux/archiso_head.cfg b/configs/releng/syslinux/archiso_head.cfg
new file mode 100644
index 0000000..e643f2d
--- /dev/null
+++ b/configs/releng/syslinux/archiso_head.cfg
@@ -0,0 +1,25 @@
+SERIAL 0 38400
+UI boot/syslinux/vesamenu.c32
+MENU TITLE Parabola GNU/Linux-libre
+MENU BACKGROUND boot/syslinux/splash.png
+
+MENU WIDTH 78
+MENU MARGIN 4
+MENU ROWS 5
+MENU VSHIFT 10
+MENU TABMSGROW 13
+MENU CMDLINEROW 11
+MENU HELPMSGROW 16
+MENU HELPMSGENDROW 29
+
+# Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu
+
+MENU COLOR border       30;44   #40ffffff #a0000000 std
+MENU COLOR title        1;36;44 #9033ccff #a0000000 std
+MENU COLOR sel          7;37;40 #e0ffffff #20ffffff all
+MENU COLOR unsel        37;44   #50ffffff #a0000000 std
+MENU COLOR help         37;40   #c0ffffff #a0000000 std
+MENU COLOR timeout_msg  37;40   #80ffffff #00000000 std
+MENU COLOR timeout      1;37;40 #c0ffffff #00000000 std
+MENU COLOR msg07        37;40   #90ffffff #a0000000 std
+MENU COLOR tabmsg       31;40   #30ffffff #00000000 std
diff --git a/configs/releng/syslinux/archiso_pxe.cfg b/configs/releng/syslinux/archiso_pxe.cfg
new file mode 100644
index 0000000..beb6fe9
--- /dev/null
+++ b/configs/releng/syslinux/archiso_pxe.cfg
@@ -0,0 +1,32 @@
+LABEL arch_nbd
+TEXT HELP
+Boot the Parabola GNU/Linux-libre live medium (Using NBD). It allows you to
+install a libre Arch Linux or perform system maintenance.
+ENDTEXT
+MENU LABEL Boot Parabola GNU/Linux-libre (NBD)
+LINUX boot/%ARCH%/vmlinuz
+INITRD boot/%ARCH%/libreiso.img
+APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver}
+IPAPPEND 3
+
+LABEL arch_nfs
+TEXT HELP
+Boot the Parabola GNU/Linux-libre live medium (Using NFS). It allows you to
+install a libre Arch Linux or perform system maintenance.
+ENDTEXT
+MENU LABEL Boot Parabola GNU/Linux-libre (NFS)
+LINUX boot/%ARCH%/vmlinuz
+INITRD boot/%ARCH%/libreiso.img
+APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt
+IPAPPEND 3
+
+LABEL arch_http
+TEXT HELP
+Boot the Parabola GNU/Linux-libre live medium (Using HTTP). It allows you to
+install a libre Arch Linux or perform system maintenance.
+ENDTEXT
+MENU LABEL Boot Parabola GNU/Linux-libre (HTTP)
+LINUX boot/%ARCH%/vmlinuz
+INITRD boot/%ARCH%/libreiso.img
+APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/
+IPAPPEND 3
diff --git a/configs/releng/syslinux/archiso_pxe_inc.cfg b/configs/releng/syslinux/archiso_pxe_inc.cfg
new file mode 100644
index 0000000..b2b6887
--- /dev/null
+++ b/configs/releng/syslinux/archiso_pxe_inc.cfg
@@ -0,0 +1,3 @@
+INCLUDE boot/syslinux/archiso_head.cfg
+INCLUDE boot/syslinux/archiso_pxe.cfg
+INCLUDE boot/syslinux/archiso_tail.cfg
diff --git a/configs/releng/syslinux/archiso_sys.cfg b/configs/releng/syslinux/archiso_sys.cfg
new file mode 100644
index 0000000..603e23d
--- /dev/null
+++ b/configs/releng/syslinux/archiso_sys.cfg
@@ -0,0 +1,9 @@
+LABEL arch
+TEXT HELP
+Boot the Parabola GNU/Linux-libre live medium. It allows you to
+install a libre Arch Linux or perform system maintenance.
+ENDTEXT
+MENU LABEL Boot Parabola GNU/Linux-libre
+LINUX boot/%ARCH%/vmlinuz
+INITRD boot/%ARCH%/libreiso.img
+APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
diff --git a/configs/releng/syslinux/archiso_sys_inc.cfg b/configs/releng/syslinux/archiso_sys_inc.cfg
new file mode 100644
index 0000000..56c6a17
--- /dev/null
+++ b/configs/releng/syslinux/archiso_sys_inc.cfg
@@ -0,0 +1,3 @@
+INCLUDE boot/syslinux/archiso_head.cfg
+INCLUDE boot/syslinux/archiso_sys.cfg
+INCLUDE boot/syslinux/archiso_tail.cfg
diff --git a/configs/releng/syslinux/archiso_tail.cfg b/configs/releng/syslinux/archiso_tail.cfg
new file mode 100644
index 0000000..a55548c
--- /dev/null
+++ b/configs/releng/syslinux/archiso_tail.cfg
@@ -0,0 +1,27 @@
+LABEL existing
+TEXT HELP
+Boot an existing operating system. Press TAB to edit the disk and partition
+number to boot.
+ENDTEXT
+MENU LABEL Boot existing OS
+COM32 boot/syslinux/chain.c32
+APPEND hd0 0
+
+# http://www.memtest.org/
+LABEL memtest
+MENU LABEL Run Memtest86+ (RAM test)
+LINUX boot/memtest
+
+# http://hdt-project.org/
+LABEL hdt
+MENU LABEL Hardware Information (HDT)
+COM32 boot/syslinux/hdt.c32
+APPEND modules_alias=boot/syslinux/hdt/modalias.gz pciids=boot/syslinux/hdt/pciids.gz
+
+LABEL reboot
+MENU LABEL Reboot
+COM32 boot/syslinux/reboot.c32
+
+LABEL poweroff
+MENU LABEL Power Off
+COMBOOT boot/syslinux/poweroff.com
diff --git a/configs/releng/syslinux/syslinux.cfg b/configs/releng/syslinux/syslinux.cfg
index 14f48e6..3ee98de 100644
--- a/configs/releng/syslinux/syslinux.cfg
+++ b/configs/releng/syslinux/syslinux.cfg
@@ -1,70 +1,5 @@
-SERIAL 0 38400
-DEFAULT vesamenu.c32
-PROMPT 0
-MENU TITLE Parabola GNU/Linux-libre
-MENU BACKGROUND splash.png
-TIMEOUT 3000
+DEFAULT loadconfig
 
-MENU WIDTH 78
-MENU MARGIN 4
-MENU ROWS 6
-MENU VSHIFT 10
-MENU TIMEOUTROW 13
-MENU TABMSGROW 11
-MENU CMDLINEROW 11
-MENU HELPMSGROW 16
-MENU HELPMSGENDROW 29
-
-# Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu
-
-MENU COLOR border       30;44   #40ffffff #a0000000 std
-MENU COLOR title        1;36;44 #9033ccff #a0000000 std
-MENU COLOR sel          7;37;40 #e0ffffff #20ffffff all
-MENU COLOR unsel        37;44   #50ffffff #a0000000 std
-MENU COLOR help         37;40   #c0ffffff #a0000000 std
-MENU COLOR timeout_msg  37;40   #80ffffff #00000000 std
-MENU COLOR timeout      1;37;40 #c0ffffff #00000000 std
-MENU COLOR msg07        37;40   #90ffffff #a0000000 std
-MENU COLOR tabmsg       31;40   #30ffffff #00000000 std
-
-LABEL libre
-TEXT HELP
-Boot the Parabola live medium. It allows you to install a fully libre
-Arch Linux or perform system maintenance.
-ENDTEXT
-MENU LABEL Boot Parabola GNU/Linux-libre
-LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz
-INITRD /%INSTALL_DIR%/boot/%ARCH%/libreiso.img
-APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
-# Next line should be uncommented when prepare enviroment to boot from PXE.
-#IPAPPEND 3
-
-LABEL existing
-TEXT HELP
-Boot an existing operating system. Press TAB to edit the disk and partition
-number to boot.
-ENDTEXT
-MENU LABEL Boot existing OS
-COM32 chain.c32
-APPEND hd0 0
-
-# http://www.memtest.org/
-LABEL memtest
-MENU LABEL Run Memtest86+ (RAM test)
-LINUX /%INSTALL_DIR%/boot/memtest
-
-# http://hdt-project.org/
-LABEL hdt
-MENU LABEL Hardware Information (HDT)
-COM32 hdt.c32
-APPEND modules_alias=hdt/modalias.gz pciids=hdt/pciids.gz
-
-LABEL reboot
-MENU LABEL Reboot
-COM32 reboot.c32
-
-LABEL poweroff
-MENU LABEL Power Off
-COMBOOT poweroff.com
-
-ONTIMEOUT libre
+LABEL loadconfig
+  CONFIG archiso.cfg
+  APPEND ../../