Merge branch 'master' of gparabola:archiso

Conflicts:
	README
	archiso/Makefile
	archiso/hooks/archiso
	archiso/hooks/archiso_loop_mnt
	archiso/hooks/archiso_pxe_nbd
	archiso/install/archiso
	archiso/install/archiso_loop_mnt
	archiso/install/archiso_pxe_nbd
	archiso/mkarchiso
	archiso/testiso
	configs/baseline/build.sh
	configs/releng/build.sh
	configs/releng/packages.i686
	configs/releng/packages.x86_64
	configs/releng/root-image/etc/hosts
	configs/releng/root-image/etc/issue
	configs/releng/root-image/etc/rc.conf
	configs/releng/syslinux.dual/archiso_pxe32.cfg
	configs/releng/syslinux.dual/archiso_pxe64.cfg
	configs/releng/syslinux/archiso_head.cfg
	configs/releng/syslinux/archiso_pxe.cfg
	configs/releng/syslinux/archiso_sys.cfg

1 files changed, 3 insertions, 2 deletions

diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index b9197c4..65dfbb2 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -43,7 +43,7 @@ make_setup_mkinitcpio() {
         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 ${script_path}/mkinitcpio.conf ${work_dir}/root-image/etc/mkinitcpio-archiso.conf
+        cp ${script_path}/mkinitcpio.conf ${work_dir}/root-image/etc/mkinitcpio-libreiso.conf
         : > ${work_dir}/build.${FUNCNAME}
    fi
 }
@@ -55,7 +55,7 @@ make_boot() {
         local _dst_boot=${work_dir}/iso/${install_dir}/boot
         mkdir -p ${_dst_boot}/${arch}
         mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \
-            -r 'mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux-libre -g /boot/libreiso.img' \
+            -r 'mkinitcpio -c /etc/mkinitcpio-libreiso.conf -k /boot/vmlinuz-linux-libre -g /boot/libreiso.img' \
             run
         mv ${_src}/boot/libreiso.img ${_dst_boot}/${arch}/libreiso.img
         mv ${_src}/boot/vmlinuz-linux-libre ${_dst_boot}/${arch}/vmlinuz
@@ -376,6 +376,7 @@ if [[ ${command_mode} == "all" && ${arch} != "x86_64" ]]; then
     echo "This mode <all> needs to be run on x86_64"
     _usage 1
 fi
+command_mode="${2}"
 
 if [[ ${command_mode} == "single" ]]; then
     work_dir=${work_dir}/${arch}