Merge branch 'master' of https://projects.archlinux.org/git/archiso

Conflicts:
	configs/baseline/build.sh
	configs/baseline/syslinux/syslinux.cfg
	configs/releng/build.sh
	configs/releng/syslinux.dual/syslinux_arch32.cfg
	configs/releng/syslinux.dual/syslinux_arch64.cfg
	configs/releng/syslinux/syslinux.cfg

3 files changed, 10 insertions, 18 deletions

diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh
index 64664fc..780194d 100755
--- a/configs/baseline/build.sh
+++ b/configs/baseline/build.sh
@@ -10,20 +10,14 @@ arch=$(uname -m)
 work_dir=work
 verbose="n"
 
+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 "syslinux" create "${work_dir}"
 }
 
-# Customize installation (root-image)
-make_customize_root_image() {
-    if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
-        cp -af root-image ${work_dir}
-        : > ${work_dir}/build.${FUNCNAME}
-    fi
-}
-
 # Copy mkinitcpio archiso hooks (root-image)
 make_setup_mkinitcpio() {
    if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
@@ -38,11 +32,11 @@ make_boot() {
     if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
         mkdir -p ${work_dir}/iso/${install_dir}/boot/${arch}
         mkinitcpio \
-            -c ./mkinitcpio.conf \
+            -c ${script_path}/mkinitcpio.conf \
             -b ${work_dir}/root-image \
-            -k /boot/vmlinuz26 \
+            -k /boot/vmlinuz-linux-libre \
             -g ${work_dir}/iso/${install_dir}/boot/${arch}/libreiso.img
-        cp ${work_dir}/root-image/boot/vmlinuz26 ${work_dir}/iso/${install_dir}/boot/${arch}
+        cp ${work_dir}/root-image/boot/vmlinuz-linux-libre ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz
         : > ${work_dir}/build.${FUNCNAME}
     fi
 }
@@ -53,7 +47,7 @@ make_syslinux() {
         mkdir -p ${work_dir}/iso/${install_dir}/boot/syslinux
         sed "s|%ARCHISO_LABEL%|${iso_label}|g;
             s|%INSTALL_DIR%|${install_dir}|g;
-            s|%ARCH%|${arch}|g" syslinux/syslinux.cfg > ${work_dir}/iso/${install_dir}/boot/syslinux/syslinux.cfg
+            s|%ARCH%|${arch}|g" ${script_path}/syslinux/syslinux.cfg > ${work_dir}/iso/${install_dir}/boot/syslinux/syslinux.cfg
         cp ${work_dir}/root-image/usr/lib/syslinux/menu.c32 ${work_dir}/iso/${install_dir}/boot/syslinux/
         : > ${work_dir}/build.${FUNCNAME}
     fi
@@ -63,7 +57,7 @@ make_syslinux() {
 make_isolinux() {
     if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
         mkdir -p ${work_dir}/iso/isolinux
-        sed "s|%INSTALL_DIR%|${install_dir}|g" isolinux/isolinux.cfg > ${work_dir}/iso/isolinux/isolinux.cfg
+        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/
         : > ${work_dir}/build.${FUNCNAME}
     fi
@@ -72,7 +66,7 @@ make_isolinux() {
 # Process aitab
 make_aitab() {
     if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
-        sed "s|%ARCH%|${arch}|g" aitab > ${work_dir}/iso/${install_dir}/aitab
+        sed "s|%ARCH%|${arch}|g" ${script_path}/aitab > ${work_dir}/iso/${install_dir}/aitab
         : > ${work_dir}/build.${FUNCNAME}
     fi
 }
@@ -84,6 +78,7 @@ make_prepare() {
 
 # Build ISO
 make_iso() {
+    mkarchiso ${verbose} checksum "${work_dir}"
     mkarchiso ${verbose} -D "${install_dir}" -L "${iso_label}" iso "${work_dir}" "${name}-${version}-${arch}.iso"
 }
 
@@ -94,7 +89,6 @@ else
 fi
 
 make_basefs
-make_customize_root_image
 make_setup_mkinitcpio
 make_boot
 make_syslinux
diff --git a/configs/baseline/root-image/etc/fstab b/configs/baseline/root-image/etc/fstab
deleted file mode 100644
index 4b82b80..0000000
--- a/configs/baseline/root-image/etc/fstab
+++ /dev/null
@@ -1,2 +0,0 @@
-# <file system>        <dir>         <type>    <options>          <dump> <pass>
-/dev/mapper/root-image /             auto      defaults           0      0
diff --git a/configs/baseline/syslinux/syslinux.cfg b/configs/baseline/syslinux/syslinux.cfg
index 58c3209..6bd59a5 100644
--- a/configs/baseline/syslinux/syslinux.cfg
+++ b/configs/baseline/syslinux/syslinux.cfg
@@ -5,7 +5,7 @@ TIMEOUT 300
 
 LABEL libre 
 MENU LABEL Parabola GNU/Linux-libre
-LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz26
+LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz
 INITRD /%INSTALL_DIR%/boot/%ARCH%/libreiso.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%