Merge branch 'move-syslinux' into dev

Hayao0819 · Hayao0819 · commit 88cbf61060ab · 2021-03-28T00:13:46.000+09:00
diff --git a/build.sh b/build.sh
@@ -731,8 +731,9 @@ make_boot() {
 # Add other aditional/extra files to ${install_dir}/boot/
 make_boot_extra() {
     if [[ -e "${airootfs_dir}/boot/memtest86+/memtest.bin" ]]; then
-        cp "${airootfs_dir}/boot/memtest86+/memtest.bin" "${isofs_dir}/${install_dir}/boot/memtest"
-        cp "${airootfs_dir}/usr/share/licenses/common/GPL2/license.txt" "${isofs_dir}/${install_dir}/boot/memtest.COPYING"
+        install -m 0644 -- "${airootfs_dir}/boot/memtest86+/memtest.bin" "${isofs_dir}/${install_dir}/boot/memtest"
+        install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/licenses/memtest86+/"
+        install -m 0644 -- "${airootfs_dir}/usr/share/licenses/common/GPL2/license.txt" "${isofs_dir}/${install_dir}/boot/licenses/memtest86+/"
     fi
 
     local _ucode_image
@@ -753,7 +754,7 @@ make_boot_extra() {
 # Prepare /${install_dir}/boot/syslinux
 make_syslinux() {
     _uname_r="$(file -b ${airootfs_dir}/boot/${kernel_filename} | awk 'f{print;f=0} /version/{f=1}' RS=' ')"
-    mkdir -p "${isofs_dir}/${install_dir}/boot/syslinux"
+    mkdir -p "${isofs_dir}/syslinux"
 
     # 一時ディレクトリに設定ファイルをコピー
     mkdir -p "${work_dir}/${arch}/syslinux/"
@@ -768,7 +769,7 @@ make_syslinux() {
              s|%OS_NAME%|${os_name}|g;
              s|%KERNEL_FILENAME%|${kernel_filename}|g;
              s|%ARCH%|${arch}|g;
-             s|%INSTALL_DIR%|${install_dir}|g" "${_cfg}" > "${isofs_dir}/${install_dir}/boot/syslinux/${_cfg##*/}"
+             s|%INSTALL_DIR%|${install_dir}|g" "${_cfg}" > "${isofs_dir}/syslinux/${_cfg##*/}"
     done
 
     # Replace the SYSLINUX configuration file with or without boot splash.
@@ -781,49 +782,48 @@ make_syslinux() {
         _no_use_config_name=splash
     fi
     for _pxe_or_sys in "sys" "pxe"; do
-        remove "${isofs_dir}/${install_dir}/boot/syslinux/archiso_${_pxe_or_sys}_${_no_use_config_name}.cfg"
-        mv "${isofs_dir}/${install_dir}/boot/syslinux/archiso_${_pxe_or_sys}_${_use_config_name}.cfg" "${isofs_dir}/${install_dir}/boot/syslinux/archiso_${_pxe_or_sys}.cfg"
+        remove "${isofs_dir}/syslinux/archiso_${_pxe_or_sys}_${_no_use_config_name}.cfg"
+        mv "${isofs_dir}/syslinux/archiso_${_pxe_or_sys}_${_use_config_name}.cfg" "${isofs_dir}/syslinux/archiso_${_pxe_or_sys}.cfg"
     done
 
     # Set syslinux wallpaper
     if [[ -f "${channel_dir}/splash.png" ]]; then
-        cp "${channel_dir}/splash.png" "${isofs_dir}/${install_dir}/boot/syslinux"
+        cp "${channel_dir}/splash.png" "${isofs_dir}/syslinux"
     else
-        cp "${script_path}/syslinux/splash.png" "${isofs_dir}/${install_dir}/boot/syslinux"
+        cp "${script_path}/syslinux/splash.png" "${isofs_dir}/syslinux"
     fi
 
     # remove config
     local _remove_config
     function _remove_config() {
-        remove "${isofs_dir}/${install_dir}/boot/syslinux/${1}"
-        sed -i "s|$(cat "${isofs_dir}/${install_dir}/boot/syslinux/archiso_sys_load.cfg" | grep "${1}")||g" "${isofs_dir}/${install_dir}/boot/syslinux/archiso_sys_load.cfg" 
+        remove "${isofs_dir}/syslinux/${1}"
+        sed -i "s|$(cat "${isofs_dir}/syslinux/archiso_sys_load.cfg" | grep "${1}")||g" "${isofs_dir}/syslinux/archiso_sys_load.cfg" 
     }
 
-    if [[ "${norescue_entry}" = true ]]; then
-        _remove_config archiso_sys_rescue.cfg
-    fi
-
-    if [[ "${memtest86}" = false ]]; then
-        _remove_config memtest86.cfg
-    fi
+    if [[ "${norescue_entry}" = true  ]]; then _remove_config archiso_sys_rescue.cfg;  fi
+    if [[ "${memtest86}"      = false ]]; then _remove_config memtest86.cfg;           fi
 
     # copy files
-    cp "${work_dir}"/${arch}/airootfs/usr/lib/syslinux/bios/*.c32 "${isofs_dir}/${install_dir}/boot/syslinux"
-    cp "${airootfs_dir}/usr/lib/syslinux/bios/lpxelinux.0" "${isofs_dir}/${install_dir}/boot/syslinux"
-    cp "${airootfs_dir}/usr/lib/syslinux/bios/memdisk" "${isofs_dir}/${install_dir}/boot/syslinux"
-    mkdir -p "${isofs_dir}/${install_dir}/boot/syslinux/hdt"
-    gzip -c -9 "${airootfs_dir}/usr/share/hwdata/pci.ids" > "${isofs_dir}/${install_dir}/boot/syslinux/hdt/pciids.gz"
-    gzip -c -9 "${airootfs_dir}/usr/lib/modules/${_uname_r}/modules.alias" > "${isofs_dir}/${install_dir}/boot/syslinux/hdt/modalias.gz"
+    cp "${work_dir}"/${arch}/airootfs/usr/lib/syslinux/bios/*.c32 "${isofs_dir}/syslinux"
+    cp "${airootfs_dir}/usr/lib/syslinux/bios/lpxelinux.0" "${isofs_dir}/syslinux"
+    cp "${airootfs_dir}/usr/lib/syslinux/bios/memdisk" "${isofs_dir}/syslinux"
+
+
+    if [[ -e "${isofs_dir}/syslinux/hdt.c32" ]]; then
+        install -d -m 0755 -- "${isofs_dir}/syslinux/hdt"
+        if [[ -e "${airootfs_dir}/usr/share/hwdata/pci.ids" ]]; then
+            gzip -c -9 "${airootfs_dir}/usr/share/hwdata/pci.ids" > "${isofs_dir}/syslinux/hdt/pciids.gz"
+        fi
+        find "${airootfs_dir}/usr/lib/modules" -name 'modules.alias' -print -exec gzip -c -9 '{}' ';' -quit > "${isofs_dir}/syslinux/hdt/modalias.gz"
+    fi
 }
 
 # Prepare /isolinux
 make_isolinux() {
-    mkdir -p "${isofs_dir}/isolinux"
-    sed "s|%INSTALL_DIR%|${install_dir}|g" \
-    "${script_path}/system/isolinux.cfg" > "${isofs_dir}/isolinux/isolinux.cfg"
-    cp "${airootfs_dir}/usr/lib/syslinux/bios/isolinux.bin" "${isofs_dir}/isolinux/"
-    cp "${airootfs_dir}/usr/lib/syslinux/bios/isohdpfx.bin" "${isofs_dir}/isolinux/"
-    cp "${airootfs_dir}/usr/lib/syslinux/bios/ldlinux.c32" "${isofs_dir}/isolinux/"
+    install -d -m 0755 -- "${isofs_dir}/syslinux"
+    sed "s|%INSTALL_DIR%|${install_dir}|g" "${script_path}/system/isolinux.cfg" > "${isofs_dir}/syslinux/isolinux.cfg"
+    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/isolinux.bin" "${isofs_dir}/syslinux/"
+    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/isohdpfx.bin" "${isofs_dir}/syslinux/"
 }
 
 # Prepare /EFI
@@ -1039,13 +1039,6 @@ make_overisofs() {
 # Build ISO
 make_iso() {
     local _iso_efi_boot_args=""
-    if [[ ! -f "${work_dir}/iso/isolinux/isolinux.bin" ]]; then
-         _msg_error "The file '${work_dir}/iso/isolinux/isolinux.bin' does not exist." 1
-    fi
-    if [[ ! -f "${work_dir}/iso/isolinux/isohdpfx.bin" ]]; then
-         _msg_error "The file '${work_dir}/iso/isolinux/isohdpfx.bin' does not exist." 1
-    fi
-
     # If exists, add an EFI "El Torito" boot image (FAT filesystem) to ISO-9660 image.
     if [[ -f "${work_dir}/iso/EFI/alteriso/efiboot.img" ]]; then
         _iso_efi_boot_args="-eltorito-alt-boot -e EFI/alteriso/efiboot.img -no-emul-boot -isohybrid-gpt-basdat"
@@ -1063,10 +1056,10 @@ make_iso() {
         -appid "${iso_application}" \
         -publisher "${iso_publisher}" \
         -preparer "prepared by AlterISO" \
-        -eltorito-boot isolinux/isolinux.bin \
-        -eltorito-catalog isolinux/boot.cat \
+        -eltorito-boot syslinux/isolinux.bin \
+        -eltorito-catalog syslinux/boot.cat \
         -no-emul-boot -boot-load-size 4 -boot-info-table \
-        -isohybrid-mbr ${work_dir}/iso/isolinux/isohdpfx.bin \
+        -isohybrid-mbr ${work_dir}/iso/syslinux/isohdpfx.bin \
         ${_iso_efi_boot_args} \
         -output "${out_dir}/${iso_filename}" \
         "${work_dir}/iso/"
diff --git a/syslinux/archiso.cfg b/syslinux/archiso.cfg
@@ -8,11 +8,11 @@
 DEFAULT select
 
 LABEL select
-COM32 boot/syslinux/whichsys.c32
+COM32 syslinux/whichsys.c32
 APPEND -pxe- pxe -sys- sys -iso- sys
 
 LABEL pxe
-CONFIG boot/syslinux/archiso_pxe_load.cfg
+CONFIG syslinux/archiso_pxe_load.cfg
 
 LABEL sys
-CONFIG boot/syslinux/archiso_sys_load.cfg
+CONFIG syslinux/archiso_sys_load.cfg
diff --git a/syslinux/archiso_head.cfg b/syslinux/archiso_head.cfg
@@ -6,9 +6,9 @@
 #
 
 SERIAL 0 38400
-UI boot/syslinux/vesamenu.c32
+UI syslinux/vesamenu.c32
 MENU TITLE %OS_NAME%
-MENU BACKGROUND boot/syslinux/splash.png
+MENU BACKGROUND syslinux/splash.png
 
 MENU WIDTH 78
 MENU MARGIN 4
diff --git a/syslinux/archiso_pxe_load.cfg b/syslinux/archiso_pxe_load.cfg
@@ -5,8 +5,8 @@
 # (c) 2019-2021 Fascode Network.
 #
 
-INCLUDE boot/syslinux/archiso_head.cfg
+INCLUDE syslinux/archiso_head.cfg
 
-INCLUDE boot/syslinux/archiso_pxe.cfg
+INCLUDE syslinux/archiso_pxe.cfg
 
-INCLUDE boot/syslinux/archiso_tail.cfg
+INCLUDE syslinux/archiso_tail.cfg
diff --git a/syslinux/archiso_pxe_nosplash.cfg b/syslinux/archiso_pxe_nosplash.cfg
@@ -5,35 +5,35 @@
 # (c) 2019-2021 Fascode Network.
 #
 
-LABEL arch_%ARCH%_nbd
+LABEL alter_%ARCH%_nbd
 TEXT HELP
 Boot the %OS_NAME% (%ARCH%) live medium (Using NBD).
 It allows you to install %OS_NAME% or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot %OS_NAME% (%ARCH%) (NBD)
-LINUX boot/%ARCH%/%KERNEL_FILENAME%
-INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/%ARCH%/archiso.img
+LINUX /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/%ARCH%/archiso.img
 APPEND arch=%ARCH% archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} checksum verify
 SYSAPPEND 3
 
-LABEL arch_%ARCH%_nfs
+LABEL alter_%ARCH%_nfs
 TEXT HELP
 Boot the %OS_NAME% (%ARCH%) live medium (Using NFS).
 It allows you to install %OS_NAME% or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot %OS_NAME% (%ARCH%) (NFS)
-LINUX boot/%ARCH%/%KERNEL_FILENAME%
-INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/%ARCH%/archiso.img
+LINUX /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/%ARCH%/archiso.img
 APPEND arch=%ARCH% archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt checksum verify
 SYSAPPEND 3
 
-LABEL arch_%ARCH%_http
+LABEL alter_%ARCH%_http
 TEXT HELP
 Boot the %OS_NAME% (%ARCH%) live medium (Using HTTP).
 It allows you to install %OS_NAME% or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot %OS_NAME% (%ARCH%) (HTTP)
-LINUX boot/%ARCH%/%KERNEL_FILENAME%
-INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/%ARCH%/archiso.img
+LINUX /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/%ARCH%/archiso.img
 APPEND arch=%ARCH% archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ checksum verify
 SYSAPPEND 3
diff --git a/syslinux/archiso_pxe_splash.cfg b/syslinux/archiso_pxe_splash.cfg
@@ -5,35 +5,35 @@
 # (c) 2019-2021 Fascode Network.
 #
 
-LABEL arch_%ARCH%_nbd
+LABEL alter_%ARCH%_nbd
 TEXT HELP
 Boot the %OS_NAME% (%ARCH%) live medium (Using NBD).
 It allows you to install %OS_NAME% or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot %OS_NAME% (%ARCH%) (NBD)
-LINUX boot/%ARCH%/%KERNEL_FILENAME%
-INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/%ARCH%/archiso.img
+LINUX /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/%ARCH%/archiso.img
 APPEND arch=%ARCH% archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} loglevel=3 quiet splash udev.log-priority=3 checksum verify
 SYSAPPEND 3
 
-LABEL arch_%ARCH%_nfs
+LABEL alter_%ARCH%_nfs
 TEXT HELP
 Boot the %OS_NAME% (%ARCH%) live medium (Using NFS).
 It allows you to install %OS_NAME% or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot %OS_NAME% (%ARCH%) (NFS)
-LINUX boot/%ARCH%/%KERNEL_FILENAME%
-INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/%ARCH%/archiso.img
+LINUX /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/%ARCH%/archiso.img
 APPEND arch=%ARCH% archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt loglevel=3 quiet splash udev.log-priority=3 checksum verify
 SYSAPPEND 3
 
-LABEL arch_%ARCH%_http
+LABEL alter_%ARCH%_http
 TEXT HELP
 Boot the %OS_NAME% (%ARCH%) live medium (Using HTTP).
 It allows you to install %OS_NAME% or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot %OS_NAME% (%ARCH%) (HTTP)
-LINUX boot/%ARCH%/%KERNEL_FILENAME%
-INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/%ARCH%/archiso.img
+LINUX /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/%ARCH%/archiso.img
 APPEND arch=%ARCH% archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ loglevel=3 quiet splash udev.log-priority=3 checksum verify
 SYSAPPEND 3
diff --git a/syslinux/archiso_select.cfg b/syslinux/archiso_select.cfg
@@ -5,5 +5,5 @@
 # (c) 2019-2021 Fascode Network.
 #
 
-DEFAULT arch_%ARCH%
+DEFAULT alter_%ARCH%
 TIMEOUT 100
diff --git a/syslinux/archiso_sys_load.cfg b/syslinux/archiso_sys_load.cfg
@@ -5,14 +5,14 @@
 # (c) 2019-2021 Fascode Network.
 #
 
-INCLUDE boot/syslinux/archiso_head.cfg
+INCLUDE syslinux/archiso_head.cfg
 
-INCLUDE boot/syslinux/archiso_select.cfg
+INCLUDE syslinux/archiso_select.cfg
 
-INCLUDE boot/syslinux/archiso_sys.cfg
+INCLUDE syslinux/archiso_sys.cfg
 
-INCLUDE boot/syslinux/archiso_sys_rescue.cfg
+INCLUDE syslinux/archiso_sys_rescue.cfg
 
-INCLUDE boot/syslinux/memtest86.cfg
+INCLUDE syslinux/memtest86.cfg
 
-INCLUDE boot/syslinux/archiso_tail.cfg
+INCLUDE syslinux/archiso_tail.cfg
diff --git a/syslinux/archiso_sys_nosplash.cfg b/syslinux/archiso_sys_nosplash.cfg
@@ -5,12 +5,12 @@
 # (c) 2019-2021 Fascode Network.
 #
 
-LABEL arch_%ARCH%
+LABEL alter_%ARCH%
 TEXT HELP
 Boot the %OS_NAME% (%ARCH%) live medium.
 It allows you to install %OS_NAME% or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot %OS_NAME% (%ARCH%)
-LINUX boot/%ARCH%/%KERNEL_FILENAME%
-INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/%ARCH%/archiso.img
+LINUX /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/%ARCH%/archiso.img
 APPEND arch=%ARCH% archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
diff --git a/syslinux/archiso_sys_rescue.cfg b/syslinux/archiso_sys_rescue.cfg
@@ -11,8 +11,8 @@ Disable KMS. Try it if you are having problems with graphics.
 Specifically, add nomodeset to the kernel parameters.
 ENDTEXT
 MENU LABEL Boot %OS_NAME% (%ARCH%) with safe graphics
-LINUX boot/%ARCH%/%KERNEL_FILENAME%
-INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/%ARCH%/archiso.img
+LINUX /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/%ARCH%/archiso.img
 APPEND arch=%ARCH% archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% nomodeset
 
 LABEL rescue
@@ -21,6 +21,6 @@ Start with minimal of prompts. do not use systemd.
 Please use it in the environment where GUI cannot be started.
 ENDTEXT
 MENU LABEL Boot %OS_NAME% (%ARCH%) without GUI
-LINUX boot/%ARCH%/%KERNEL_FILENAME%
-INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/%ARCH%/archiso.img
+LINUX /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/%ARCH%/archiso.img
 APPEND arch=%ARCH% archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% systemd.unit=multi-user.target nomodeset
diff --git a/syslinux/archiso_sys_splash.cfg b/syslinux/archiso_sys_splash.cfg
@@ -5,22 +5,22 @@
 # (c) 2019-2021 Fascode Network.
 #
 
-LABEL arch_%ARCH%
+LABEL alter_%ARCH%
 TEXT HELP
 Boot the %OS_NAME% (%ARCH%) live medium.
 It allows you to install %OS_NAME% or perform system maintenance.
 ENDTEXT
 MENU LABEL Boot %OS_NAME% (%ARCH%)
-LINUX boot/%ARCH%/%KERNEL_FILENAME%
-INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/%ARCH%/archiso.img
+LINUX /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/%ARCH%/archiso.img
 APPEND arch=%ARCH% archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% loglevel=3 quiet splash udev.log-priority=3
 
-LABEL arch_%ARCH%_res
+LABEL alter_%ARCH%_res
 TEXT HELP
 Boot the %OS_NAME% (%ARCH%) live medium.
 This allows %OS_NAME% to boot without boot splash.
 ENDTEXT
 MENU LABEL Boot %OS_NAME% (%ARCH%) without boot splash
-LINUX boot/%ARCH%/%KERNEL_FILENAME%
-INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/%ARCH%/archiso.img
+LINUX /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/%ARCH%/archiso.img
 APPEND arch=%ARCH% archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
diff --git a/syslinux/archiso_tail.cfg b/syslinux/archiso_tail.cfg
@@ -11,7 +11,7 @@ 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
+COM32 syslinux/chain.c32
 APPEND hd0 0
 
 # http://hdt-project.org/
@@ -21,21 +21,21 @@ Hardware Detection Tool included with SYSLINUX.
 Displays detailed information on hardware and systems.
 ENDTEXT
 MENU LABEL Hardware Information (HDT)
-COM32 boot/syslinux/hdt.c32
-APPEND modules_alias=boot/syslinux/hdt/modalias.gz pciids=boot/syslinux/hdt/pciids.gz
+COM32 syslinux/hdt.c32
+APPEND modules_alias=syslinux/hdt/modalias.gz pciids=syslinux/hdt/pciids.gz
 
 LABEL reboot
 TEXT HELP
 Reboot computer.
 The computer's firmware must support APM.
 ENDTEXT
 MENU LABEL Reboot
-COM32 boot/syslinux/reboot.c32
+COM32 syslinux/reboot.c32
 
 LABEL poweroff
 TEXT HELP
 Power off computer.
 The computer's firmware must support APM.
 ENDTEXT
 MENU LABEL Power Off
-COM32 boot/syslinux/poweroff.c32
+COM32 syslinux/poweroff.c32
diff --git a/system/isolinux.cfg b/system/isolinux.cfg

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@`
`5`	`5`	`# (c) 2019-2021 Fascode Network.`
`6`	`6`	`#`
`7`	`7`
`8`		`-INCLUDE boot/syslinux/archiso_head.cfg`
	`8`	`+INCLUDE syslinux/archiso_head.cfg`
`9`	`9`
`10`		`-INCLUDE boot/syslinux/archiso_pxe.cfg`
	`10`	`+INCLUDE syslinux/archiso_pxe.cfg`
`11`	`11`
`12`		`-INCLUDE boot/syslinux/archiso_tail.cfg`
	`12`	`+INCLUDE syslinux/archiso_tail.cfg`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@`
`5`	`5`	`# (c) 2019-2021 Fascode Network.`
`6`	`6`	`#`
`7`	`7`
`8`		`-DEFAULT arch_%ARCH%`
	`8`	`+DEFAULT alter_%ARCH%`
`9`	`9`	`TIMEOUT 100`