From: hayao Date: Sat, 19 Sep 2020 09:17:36 +0000 (+0900) Subject: [update] : Syslinux shared between architectures X-Git-Tag: rc3-alpha1~165^2~81 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3ae65a1fe1d77f033d7f37547b0570101c68a135;p=alterlinux%2Falterlinux.git [update] : Syslinux shared between architectures --- diff --git a/syslinux/i686/archiso.cfg b/syslinux/archiso.cfg similarity index 100% rename from syslinux/i686/archiso.cfg rename to syslinux/archiso.cfg diff --git a/syslinux/x86_64/archiso_head.cfg b/syslinux/archiso_head.cfg similarity index 100% rename from syslinux/x86_64/archiso_head.cfg rename to syslinux/archiso_head.cfg diff --git a/syslinux/i686/archiso_pxe_load.cfg b/syslinux/archiso_pxe_load.cfg similarity index 100% rename from syslinux/i686/archiso_pxe_load.cfg rename to syslinux/archiso_pxe_load.cfg diff --git a/syslinux/archiso_pxe_nosplash.cfg b/syslinux/archiso_pxe_nosplash.cfg new file mode 100644 index 00000000..1996e037 --- /dev/null +++ b/syslinux/archiso_pxe_nosplash.cfg @@ -0,0 +1,39 @@ +# Yamada Hayao +# Twitter: @Hayao0819 +# Email : hayao@fascode.net +# +# (c) 2019-2020 Fascode Network. +# + +LABEL arch_%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 +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} +SYSAPPEND 3 + +LABEL arch_%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 +APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt +SYSAPPEND 3 + +LABEL arch_%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 +APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ +SYSAPPEND 3 \ No newline at end of file diff --git a/syslinux/x86_64/archiso_pxe_splash.cfg b/syslinux/archiso_pxe_splash.cfg similarity index 54% rename from syslinux/x86_64/archiso_pxe_splash.cfg rename to syslinux/archiso_pxe_splash.cfg index 3151573f..7733aa7b 100644 --- a/syslinux/x86_64/archiso_pxe_splash.cfg +++ b/syslinux/archiso_pxe_splash.cfg @@ -5,35 +5,35 @@ # (c) 2019-2020 Fascode Network. # -LABEL arch64_nbd +LABEL arch_%ARCH%_nbd TEXT HELP -Boot the %OS_NAME% (x86_64) live medium (Using NBD). +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% (x86_64) (NBD) -LINUX boot/x86_64/%KERNEL_FILENAME% -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +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 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} loglevel=3 quiet splash udev.log-priority=3 SYSAPPEND 3 -LABEL arch64_nfs +LABEL arch_%ARCH%_nfs TEXT HELP -Boot the %OS_NAME% (x86_64) live medium (Using NFS). +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% (x86_64) (NFS) -LINUX boot/x86_64/%KERNEL_FILENAME% -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +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 APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt loglevel=3 quiet splash udev.log-priority=3 SYSAPPEND 3 -LABEL arch64_http +LABEL arch_%ARCH%_http TEXT HELP -Boot the %OS_NAME% (x86_64) live medium (Using HTTP). +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% (x86_64) (HTTP) -LINUX boot/x86_64/%KERNEL_FILENAME% -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +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 APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ loglevel=3 quiet splash udev.log-priority=3 SYSAPPEND 3 \ No newline at end of file diff --git a/syslinux/i686/archiso_sys_load.cfg b/syslinux/archiso_sys_load.cfg similarity index 100% rename from syslinux/i686/archiso_sys_load.cfg rename to syslinux/archiso_sys_load.cfg diff --git a/syslinux/x86_64/archiso_sys_nosplash.cfg b/syslinux/archiso_sys_nosplash.cfg similarity index 59% rename from syslinux/x86_64/archiso_sys_nosplash.cfg rename to syslinux/archiso_sys_nosplash.cfg index 8b2d2b79..bee29922 100644 --- a/syslinux/x86_64/archiso_sys_nosplash.cfg +++ b/syslinux/archiso_sys_nosplash.cfg @@ -5,17 +5,17 @@ # (c) 2019-2020 Fascode Network. # -DEFAULT arch64 +DEFAULT arch_%ARCH% TIMEOUT 100 -LABEL arch64 +LABEL arch_%ARCH% TEXT HELP -Boot the %OS_NAME% (x86_64) live medium. +Boot the %OS_NAME% (%ARCH%) live medium. It allows you to install %OS_NAME% or perform system maintenance. ENDTEXT -MENU LABEL Boot %OS_NAME% (x86_64) -LINUX boot/x86_64/%KERNEL_FILENAME% -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +MENU LABEL Boot %OS_NAME% (%ARCH%) +LINUX boot/%ARCH%/%KERNEL_FILENAME% +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ARCH%/archiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% LABEL safegraphic @@ -23,9 +23,9 @@ TEXT HELP Disable KMS. Try it if you are having problems with graphics. Specifically, add nomodeset to the kernel parameters. ENDTEXT -MENU LABEL Boot %OS_NAME% (x86_64) with safe graphic -LINUX boot/x86_64/%KERNEL_FILENAME% -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +MENU LABEL Boot %OS_NAME% (%ARCH%) with safe graphic +LINUX boot/%ARCH%/%KERNEL_FILENAME% +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ARCH%/archiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% nomodeset LABEL rescue @@ -33,7 +33,7 @@ TEXT HELP 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% (x86_64) without GUI -LINUX boot/x86_64/%KERNEL_FILENAME% -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +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 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% systemd.unit=multi-user.target nomodeset diff --git a/syslinux/x86_64/archiso_sys_splash.cfg b/syslinux/archiso_sys_splash.cfg similarity index 56% rename from syslinux/x86_64/archiso_sys_splash.cfg rename to syslinux/archiso_sys_splash.cfg index 97895902..3b6389f8 100644 --- a/syslinux/x86_64/archiso_sys_splash.cfg +++ b/syslinux/archiso_sys_splash.cfg @@ -5,27 +5,27 @@ # (c) 2019-2020 Fascode Network. # -DEFAULT arch64 +DEFAULT arch_%ARCH% TIMEOUT 100 -LABEL arch64 +LABEL arch_%ARCH% TEXT HELP -Boot the %OS_NAME% (x86_64) live medium. +Boot the %OS_NAME% (%ARCH%) live medium. It allows you to install %OS_NAME% or perform system maintenance. ENDTEXT -MENU LABEL Boot %OS_NAME% (x86_64) -LINUX boot/x86_64/%KERNEL_FILENAME% -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +MENU LABEL Boot %OS_NAME% (%ARCH%) +LINUX boot/%ARCH%/%KERNEL_FILENAME% +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ARCH%/archiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% loglevel=3 quiet splash udev.log-priority=3 -LABEL arch64_res +LABEL arch_%ARCH%_res TEXT HELP -Boot the %OS_NAME% (x86_64) live medium. +Boot the %OS_NAME% (%ARCH%) live medium. This allows %OS_NAME% to boot without boot splash. ENDTEXT -MENU LABEL Boot %OS_NAME% without boot splash (x86_64) -LINUX boot/x86_64/%KERNEL_FILENAME% -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +MENU LABEL Boot %OS_NAME% without boot splash (%ARCH%) +LINUX boot/%ARCH%/%KERNEL_FILENAME% +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ARCH%/archiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% LABEL safegraphic @@ -33,9 +33,9 @@ TEXT HELP Disable KMS. Try it if you are having problems with graphics. Specifically, add nomodeset to the kernel parameters. ENDTEXT -MENU LABEL Boot %OS_NAME% (x86_64) with safe graphic -LINUX boot/x86_64/%KERNEL_FILENAME% -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +MENU LABEL Boot %OS_NAME% (%ARCH%) with safe graphic +LINUX boot/%ARCH%/%KERNEL_FILENAME% +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ARCH%/archiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% nomodeset LABEL rescue @@ -43,7 +43,7 @@ TEXT HELP 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% (x86_64) without GUI -LINUX boot/x86_64/%KERNEL_FILENAME% -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +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 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% systemd.unit=multi-user.target nomodeset diff --git a/syslinux/i686/archiso_tail.cfg b/syslinux/archiso_tail.cfg similarity index 100% rename from syslinux/i686/archiso_tail.cfg rename to syslinux/archiso_tail.cfg diff --git a/syslinux/i686/archiso_head.cfg b/syslinux/i686/archiso_head.cfg deleted file mode 100644 index b291ca1b..00000000 --- a/syslinux/i686/archiso_head.cfg +++ /dev/null @@ -1,32 +0,0 @@ -# Yamada Hayao -# Twitter: @Hayao0819 -# Email : hayao@fascode.net -# -# (c) 2019-2020 Fascode Network. -# - -SERIAL 0 38400 -UI boot/syslinux/vesamenu.c32 -MENU TITLE %OS_NAME% -MENU BACKGROUND boot/syslinux/splash.png - -MENU WIDTH 78 -MENU MARGIN 4 -MENU ROWS 7 -MENU VSHIFT 10 -MENU TABMSGROW 14 -MENU CMDLINEROW 14 -MENU HELPMSGROW 16 -MENU HELPMSGENDROW 29 - -# Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu - -MENU COLOR border 30;44 #40ffffff #a0000000 std -MENU COLOR title 1;36;44 #9033ccff #a0000000 std -MENU COLOR sel 7;37;40 #e0ffffff #20ffffff all -MENU COLOR unsel 37;44 #50ffffff #a0000000 std -MENU COLOR help 37;40 #c0ffffff #a0000000 std -MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std -MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std -MENU COLOR msg07 37;40 #90ffffff #a0000000 std -MENU COLOR tabmsg 31;40 #30ffffff #00000000 std diff --git a/syslinux/i686/archiso_pxe_nosplash.cfg b/syslinux/i686/archiso_pxe_nosplash.cfg deleted file mode 100644 index a4ec0c81..00000000 --- a/syslinux/i686/archiso_pxe_nosplash.cfg +++ /dev/null @@ -1,39 +0,0 @@ -# Yamada Hayao -# Twitter: @Hayao0819 -# Email : hayao@fascode.net -# -# (c) 2019-2020 Fascode Network. -# - -LABEL arch32_nbd -TEXT HELP -Boot the %OS_NAME% (i686) live medium (Using NBD). -It allows you to install %OS_NAME% or perform system maintenance. -ENDTEXT -MENU LABEL Boot %OS_NAME% (i686) (NBD) -LINUX boot/i686/%KERNEL_FILENAME% -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/i686/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} -SYSAPPEND 3 - -LABEL arch32_nfs -TEXT HELP -Boot the %OS_NAME% (i686) live medium (Using NFS). -It allows you to install %OS_NAME% or perform system maintenance. -ENDTEXT -MENU LABEL Boot %OS_NAME% (i686) (NFS) -LINUX boot/i686/%KERNEL_FILENAME% -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/i686/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt -SYSAPPEND 3 - -LABEL arch32_http -TEXT HELP -Boot the %OS_NAME% (i686) live medium (Using HTTP). -It allows you to install %OS_NAME% or perform system maintenance. -ENDTEXT -MENU LABEL Boot %OS_NAME% (i686) (HTTP) -LINUX boot/i686/%KERNEL_FILENAME% -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/i686/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ -SYSAPPEND 3 \ No newline at end of file diff --git a/syslinux/i686/archiso_pxe_splash.cfg b/syslinux/i686/archiso_pxe_splash.cfg deleted file mode 100644 index 36d26025..00000000 --- a/syslinux/i686/archiso_pxe_splash.cfg +++ /dev/null @@ -1,39 +0,0 @@ -# Yamada Hayao -# Twitter: @Hayao0819 -# Email : hayao@fascode.net -# -# (c) 2019-2020 Fascode Network. -# - -LABEL arch32_nbd -TEXT HELP -Boot the %OS_NAME% (i686) live medium (Using NBD). -It allows you to install %OS_NAME% or perform system maintenance. -ENDTEXT -MENU LABEL Boot %OS_NAME% (i686) (NBD) -LINUX boot/i686/%KERNEL_FILENAME% -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/i686/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} loglevel=3 quiet splash udev.log-priority=3 -SYSAPPEND 3 - -LABEL arch32_nfs -TEXT HELP -Boot the %OS_NAME% (i686) live medium (Using NFS). -It allows you to install %OS_NAME% or perform system maintenance. -ENDTEXT -MENU LABEL Boot %OS_NAME% (i686) (NFS) -LINUX boot/i686/%KERNEL_FILENAME% -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/i686/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt loglevel=3 quiet splash udev.log-priority=3 -SYSAPPEND 3 - -LABEL arch32_http -TEXT HELP -Boot the %OS_NAME% (i686) live medium (Using HTTP). -It allows you to install %OS_NAME% or perform system maintenance. -ENDTEXT -MENU LABEL Boot %OS_NAME% (i686) (HTTP) -LINUX boot/i686/%KERNEL_FILENAME% -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/i686/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ loglevel=3 quiet splash udev.log-priority=3 -SYSAPPEND 3 \ No newline at end of file diff --git a/syslinux/i686/archiso_sys_nosplash.cfg b/syslinux/i686/archiso_sys_nosplash.cfg deleted file mode 100644 index b2d1ab45..00000000 --- a/syslinux/i686/archiso_sys_nosplash.cfg +++ /dev/null @@ -1,39 +0,0 @@ -# Yamada Hayao -# Twitter: @Hayao0819 -# Email : hayao@fascode.net -# -# (c) 2019-2020 Fascode Network. -# - -DEFAULT arch32 -TIMEOUT 100 - -LABEL arch32 -TEXT HELP -Boot the %OS_NAME% (i686) live medium. -It allows you to install %OS_NAME% or perform system maintenance. -ENDTEXT -MENU LABEL Boot %OS_NAME% (i686) -LINUX boot/i686/%KERNEL_FILENAME% -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/i686/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% - -LABEL safegraphic -TEXT HELP -Disable KMS. Try it if you are having problems with graphics. -Specifically, add nomodeset to the kernel parameters. -ENDTEXT -MENU LABEL Boot %OS_NAME% (i686) with safe graphic -LINUX boot/i686/%KERNEL_FILENAME% -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/i686/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% nomodeset - -LABEL rescue -TEXT HELP -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% (i686) without GUI -LINUX boot/i686/%KERNEL_FILENAME% -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/i686/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% systemd.unit=multi-user.target nomodeset diff --git a/syslinux/i686/archiso_sys_splash.cfg b/syslinux/i686/archiso_sys_splash.cfg deleted file mode 100644 index 78641864..00000000 --- a/syslinux/i686/archiso_sys_splash.cfg +++ /dev/null @@ -1,48 +0,0 @@ -# Yamada Hayao -# Twitter: @Hayao0819 -# Email : hayao@fascode.net -# -# (c) 2019-2020 Fascode Network. -# - -DEFAULT arch32 -TIMEOUT 100 - -LABEL arch32 -TEXT HELP -Boot the %OS_NAME% (i686) live medium. -It allows you to install %OS_NAME% or perform system maintenance. -ENDTEXT -MENU LABEL Boot %OS_NAME% (i686) -LINUX boot/i686/%KERNEL_FILENAME% -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/i686/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% loglevel=3 quiet splash udev.log-priority=3 - -LABEL arch32_res -TEXT HELP -Boot the %OS_NAME% (i686) live medium. -This allows %OS_NAME% to boot without boot splash. -ENDTEXT -MENU LABEL Boot %OS_NAME% without boot splash (i686) -LINUX boot/i686/%KERNEL_FILENAME% -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/i686/archiso.img - -LABEL safegraphic -TEXT HELP -Disable KMS. Try it if you are having problems with graphics. -Specifically, add nomodeset to the kernel parameters. -ENDTEXT -MENU LABEL Boot %OS_NAME% (i686) with safe graphic -LINUX boot/i686/%KERNEL_FILENAME% -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/i686/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% nomodeset - -LABEL rescue -TEXT HELP -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% (i686) without GUI -LINUX boot/i686/%KERNEL_FILENAME% -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/i686/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% systemd.unit=multi-user.target nomodeset diff --git a/syslinux/i686/splash.png b/syslinux/splash.png similarity index 100% rename from syslinux/i686/splash.png rename to syslinux/splash.png diff --git a/syslinux/i686/syslinux.cfg b/syslinux/syslinux.cfg similarity index 100% rename from syslinux/i686/syslinux.cfg rename to syslinux/syslinux.cfg diff --git a/syslinux/x86_64/archiso.cfg b/syslinux/x86_64/archiso.cfg deleted file mode 100644 index 683e105e..00000000 --- a/syslinux/x86_64/archiso.cfg +++ /dev/null @@ -1,18 +0,0 @@ -# Yamada Hayao -# Twitter: @Hayao0819 -# Email : hayao@fascode.net -# -# (c) 2019-2020 Fascode Network. -# - -DEFAULT select - -LABEL select -COM32 boot/syslinux/whichsys.c32 -APPEND -pxe- pxe -sys- sys -iso- sys - -LABEL pxe -CONFIG boot/syslinux/archiso_pxe_load.cfg - -LABEL sys -CONFIG boot/syslinux/archiso_sys_load.cfg diff --git a/syslinux/x86_64/archiso_pxe_load.cfg b/syslinux/x86_64/archiso_pxe_load.cfg deleted file mode 100644 index 70ac09ae..00000000 --- a/syslinux/x86_64/archiso_pxe_load.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Yamada Hayao -# Twitter: @Hayao0819 -# Email : hayao@fascode.net -# -# (c) 2019-2020 Fascode Network. -# - -INCLUDE boot/syslinux/archiso_head.cfg - -INCLUDE boot/syslinux/archiso_pxe.cfg - -INCLUDE boot/syslinux/archiso_tail.cfg diff --git a/syslinux/x86_64/archiso_pxe_nosplash.cfg b/syslinux/x86_64/archiso_pxe_nosplash.cfg deleted file mode 100644 index edf8f092..00000000 --- a/syslinux/x86_64/archiso_pxe_nosplash.cfg +++ /dev/null @@ -1,39 +0,0 @@ -# Yamada Hayao -# Twitter: @Hayao0819 -# Email : hayao@fascode.net -# -# (c) 2019-2020 Fascode Network. -# - -LABEL arch64_nbd -TEXT HELP -Boot the %OS_NAME% (x86_64) live medium (Using NBD). -It allows you to install %OS_NAME% or perform system maintenance. -ENDTEXT -MENU LABEL Boot %OS_NAME% (x86_64) (NBD) -LINUX boot/x86_64/%KERNEL_FILENAME% -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} -SYSAPPEND 3 - -LABEL arch64_nfs -TEXT HELP -Boot the %OS_NAME% (x86_64) live medium (Using NFS). -It allows you to install %OS_NAME% or perform system maintenance. -ENDTEXT -MENU LABEL Boot %OS_NAME% (x86_64) (NFS) -LINUX boot/x86_64/%KERNEL_FILENAME% -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt -SYSAPPEND 3 - -LABEL arch64_http -TEXT HELP -Boot the %OS_NAME% (x86_64) live medium (Using HTTP). -It allows you to install %OS_NAME% or perform system maintenance. -ENDTEXT -MENU LABEL Boot %OS_NAME% (x86_64) (HTTP) -LINUX boot/x86_64/%KERNEL_FILENAME% -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ -SYSAPPEND 3 \ No newline at end of file diff --git a/syslinux/x86_64/archiso_sys_load.cfg b/syslinux/x86_64/archiso_sys_load.cfg deleted file mode 100644 index 658a17a3..00000000 --- a/syslinux/x86_64/archiso_sys_load.cfg +++ /dev/null @@ -1,12 +0,0 @@ -# Yamada Hayao -# Twitter: @Hayao0819 -# Email : hayao@fascode.net -# -# (c) 2019-2020 Fascode Network. -# - -INCLUDE boot/syslinux/archiso_head.cfg - -INCLUDE boot/syslinux/archiso_sys.cfg - -INCLUDE boot/syslinux/archiso_tail.cfg diff --git a/syslinux/x86_64/archiso_tail.cfg b/syslinux/x86_64/archiso_tail.cfg deleted file mode 100644 index 00fd0700..00000000 --- a/syslinux/x86_64/archiso_tail.cfg +++ /dev/null @@ -1,46 +0,0 @@ -# Yamada Hayao -# Twitter: @Hayao0819 -# Email : hayao@fascode.net -# -# (c) 2019-2020 Fascode Network. -# - -LABEL existing -TEXT HELP -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 -APPEND hd0 0 - -# http://www.memtest.org/ -# LABEL memtest -# MENU LABEL Run Memtest86+ (RAM test) -# LINUX boot/memtest - -# http://hdt-project.org/ -LABEL hdt -TEXT HELP -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 - -LABEL reboot -TEXT HELP -Reboot computer. -The computer's firmware must support APM. -ENDTEXT -MENU LABEL Reboot -COM32 boot/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 diff --git a/syslinux/x86_64/splash.png b/syslinux/x86_64/splash.png deleted file mode 100644 index 5a708b81..00000000 Binary files a/syslinux/x86_64/splash.png and /dev/null differ diff --git a/syslinux/x86_64/syslinux.cfg b/syslinux/x86_64/syslinux.cfg deleted file mode 100644 index 3ee98dee..00000000 --- a/syslinux/x86_64/syslinux.cfg +++ /dev/null @@ -1,5 +0,0 @@ -DEFAULT loadconfig - -LABEL loadconfig - CONFIG archiso.cfg - APPEND ../../