[add] : archiso_sys_rescue

diff --git a/allarch.sh b/allarch.sh
index 1a8de42..d5586ad 100755 (executable)
--- a/allarch.sh
+++ b/allarch.sh
@@ -933,7 +933,7 @@ make_syslinux() {
     fi
 
     # copy all syslinux config to work dir
-    for _cfg in $work_dir/${arch}/syslinux/*.cfg; do
+    for _cfg in ${work_dir}/${arch}/syslinux/*.cfg; do
         sed "s|%ARCHISO_LABEL%|${iso_label}|g;
              s|%OS_NAME%|${os_name}|g;
              s|%KERNEL_FILENAME%|${kernel_filename}|g;
@@ -962,6 +962,9 @@ make_syslinux() {
         cp "${script_path}/syslinux/splash.png" "${work_dir}/iso/${install_dir}/boot/syslinux"
     fi
 
+    # Rename rescue config
+    mv "${work_dir}/iso/${install_dir}/boot/syslinux/archiso_sys_rescue.cfg" "${work_dir}/iso/${install_dir}/boot/syslinux/archiso_sys_rescue_${arch}.cfg"
+
     # copy files
     cp "${work_dir}"/${arch}/airootfs/usr/lib/syslinux/bios/*.c32 "${work_dir}/iso/${install_dir}/boot/syslinux"
     cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/lpxelinux.0" "${work_dir}/iso/${install_dir}/boot/syslinux"
@@ -977,7 +980,12 @@ make_syslinux_loadfiles() {
     for _pxe_or_sys in "sys" "pxe"; do
         _write_load() { echo -e "${@}" >> "${work_dir}/iso/${install_dir}/boot/syslinux/archiso_${_pxe_or_sys}_load.cfg"; }
         _write_load "INCLUDE boot/syslinux/archiso_head.cfg"
-        for _arch in ${all_arch[@]}; do _write_load "INCLUDE boot/syslinux/archiso_${_pxe_or_sys}_${_arch}.cfg"; done
+        for _arch in ${all_arch[@]}; do 
+            _write_load "INCLUDE boot/syslinux/archiso_${_pxe_or_sys}_${_arch}.cfg"
+            if [[ "${_pxe_or_sys}" = "sys" ]]; then
+                _write_load "INCLUDE boot/syslinux/archiso_sys_rescue_${arch}.cfg"
+            fi
+        done
         _write_load "INCLUDE boot/syslinux/archiso_tail.cfg"
     done
 }

diff --git a/syslinux/archiso_sys_load.cfg b/syslinux/archiso_sys_load.cfg
index 1a35254..0daa787 100644 (file)
--- a/syslinux/archiso_sys_load.cfg
+++ b/syslinux/archiso_sys_load.cfg
@@ -11,4 +11,6 @@ INCLUDE boot/syslinux/archiso_select.cfg
 
 INCLUDE boot/syslinux/archiso_sys.cfg
 
+INCLUDE boot/syslinux/archiso_sys_rescue.cfg
+
 INCLUDE boot/syslinux/archiso_tail.cfg

diff --git a/syslinux/archiso_sys_nosplash.cfg b/syslinux/archiso_sys_nosplash.cfg
index 1a09425..3c2b40c 100644 (file)
--- a/syslinux/archiso_sys_nosplash.cfg
+++ b/syslinux/archiso_sys_nosplash.cfg
@@ -14,23 +14,3 @@ 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
-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% (%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
-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% (%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/archiso_sys_rescue.cfg b/syslinux/archiso_sys_rescue.cfg
new file mode 100644 (file)
index 0000000..336499a
--- /dev/null
+++ b/syslinux/archiso_sys_rescue.cfg
@@ -0,0 +1,26 @@
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2020 Fascode Network.
+#
+
+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% (%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
+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% (%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/archiso_sys_splash.cfg b/syslinux/archiso_sys_splash.cfg
index d709620..ff7e5b6 100644 (file)
--- a/syslinux/archiso_sys_splash.cfg
+++ b/syslinux/archiso_sys_splash.cfg
@@ -24,23 +24,3 @@ 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
 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% (%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
-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% (%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