[archiso] Update kernel image name for linux-3.0

Also rename kernel from vmlinuz-linux to vmlinuz to make filename
ISO9660 friendly.

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>

6 files changed, 8 insertions, 8 deletions

diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh
index 1fec3d0..0dbed2a 100755
--- a/configs/baseline/build.sh
+++ b/configs/baseline/build.sh
@@ -40,9 +40,9 @@ make_boot() {
         mkinitcpio \
             -c ./mkinitcpio.conf \
             -b ${work_dir}/root-image \
-            -k /boot/vmlinuz26 \
+            -k /boot/vmlinuz-linux \
             -g ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img
-        cp ${work_dir}/root-image/boot/vmlinuz26 ${work_dir}/iso/${install_dir}/boot/${arch}
+        cp ${work_dir}/root-image/boot/vmlinuz-linux ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz
         : > ${work_dir}/build.${FUNCNAME}
     fi
 }
diff --git a/configs/baseline/syslinux/syslinux.cfg b/configs/baseline/syslinux/syslinux.cfg
index f755453..5ae9823 100644
--- a/configs/baseline/syslinux/syslinux.cfg
+++ b/configs/baseline/syslinux/syslinux.cfg
@@ -5,7 +5,7 @@ TIMEOUT 300
 
 LABEL arch
 MENU LABEL Arch Linux
-LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz26
+LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz
 INITRD /%INSTALL_DIR%/boot/%ARCH%/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
 
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index 7da0215..0398269 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -57,9 +57,9 @@ make_boot() {
         mkinitcpio \
             -c ./mkinitcpio.conf \
             -b ${_src} \
-            -k /boot/vmlinuz26 \
+            -k /boot/vmlinuz-linux \
             -g ${_dst_boot}/${arch}/archiso.img
-        mv ${_src}/boot/vmlinuz26 ${_dst_boot}/${arch}
+        mv ${_src}/boot/vmlinuz-linux ${_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
         : > ${work_dir}/build.${FUNCNAME}
diff --git a/configs/releng/syslinux.dual/syslinux_arch32.cfg b/configs/releng/syslinux.dual/syslinux_arch32.cfg
index 6947d75..9b4030e 100644
--- a/configs/releng/syslinux.dual/syslinux_arch32.cfg
+++ b/configs/releng/syslinux.dual/syslinux_arch32.cfg
@@ -4,7 +4,7 @@ Boot the Arch Linux (i686) live medium. It allows you to install Arch Linux or
 perform system maintenance.
 ENDTEXT
 MENU LABEL Boot Arch Linux (i686)
-LINUX /%INSTALL_DIR%/boot/i686/vmlinuz26
+LINUX /%INSTALL_DIR%/boot/i686/vmlinuz
 INITRD /%INSTALL_DIR%/boot/i686/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
 # Next line should be uncommented when prepare enviroment to boot from PXE.
diff --git a/configs/releng/syslinux.dual/syslinux_arch64.cfg b/configs/releng/syslinux.dual/syslinux_arch64.cfg
index 02ddc5a..6cc644d 100644
--- a/configs/releng/syslinux.dual/syslinux_arch64.cfg
+++ b/configs/releng/syslinux.dual/syslinux_arch64.cfg
@@ -4,7 +4,7 @@ Boot the Arch Linux (x86_64) live medium. It allows you to install Arch Linux or
 perform system maintenance.
 ENDTEXT
 MENU LABEL Boot Arch Linux (x86_64)
-LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz26
+LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz
 INITRD /%INSTALL_DIR%/boot/x86_64/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
 # Next line should be uncommented when prepare enviroment to boot from PXE.
diff --git a/configs/releng/syslinux/syslinux.cfg b/configs/releng/syslinux/syslinux.cfg
index de840f4..7762278 100644
--- a/configs/releng/syslinux/syslinux.cfg
+++ b/configs/releng/syslinux/syslinux.cfg
@@ -33,7 +33,7 @@ Boot the Arch Linux live medium. It allows you to install Arch Linux or
 perform system maintenance.
 ENDTEXT
 MENU LABEL Boot Arch Linux
-LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz26
+LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz
 INITRD /%INSTALL_DIR%/boot/%ARCH%/archiso.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
 # Next line should be uncommented when prepare enviroment to boot from PXE.