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

6 files changed, 24 insertions, 6 deletions

diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh
index 06b76ba..02f0fb5 100755
--- a/configs/baseline/build.sh
+++ b/configs/baseline/build.sh
@@ -23,7 +23,7 @@ make_setup_mkinitcpio() {
    if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
         cp /usr/lib/initcpio/hooks/archiso ${work_dir}/root-image/usr/lib/initcpio/hooks
         cp /usr/lib/initcpio/install/archiso ${work_dir}/root-image/usr/lib/initcpio/install
-        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
 }
@@ -33,7 +33,7 @@ make_boot() {
     if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
         mkdir -p ${work_dir}/iso/${install_dir}/boot/${arch}
         mkarchiso ${verbose} -w "${work_dir}" -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
         cp ${work_dir}/root-image/boot/libreiso.img ${work_dir}/iso/${install_dir}/boot/${arch}/libreiso.img
         cp ${work_dir}/root-image/boot/vmlinuz-linux-libre ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz
diff --git a/configs/baseline/syslinux/syslinux.cfg b/configs/baseline/syslinux/syslinux.cfg
index 7f5ac05..a959e0a 100644
--- a/configs/baseline/syslinux/syslinux.cfg
+++ b/configs/baseline/syslinux/syslinux.cfg
@@ -1,7 +1,7 @@
 UI menu.c32
 MENU TITLE Parabola GNU/Linux-libre
 
-LABEL libre 
+LABEL libre
 MENU LABEL Parabola GNU/Linux-libre
 LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz
 INITRD /%INSTALL_DIR%/boot/%ARCH%/libreiso.img
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}
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/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/archiso_head.cfg b/configs/releng/syslinux/archiso_head.cfg
index 1394dfe..765102c 100644
--- a/configs/releng/syslinux/archiso_head.cfg
+++ b/configs/releng/syslinux/archiso_head.cfg
@@ -1,6 +1,6 @@
 SERIAL 0 38400
 UI boot/syslinux/vesamenu.c32
-MENU TITLE Parabola
+MENU TITLE Parabola GNU/Linux-libre
 MENU BACKGROUND boot/syslinux/splash.png
 
 MENU WIDTH 78