diff --git a/build.sh b/build.sh index 8e3cdb6..622776a 100755 --- a/build.sh +++ b/build.sh @@ -11,7 +11,7 @@ iso_mainver="${iso_version%-*}" iso_label="SYSRES${iso_mainver//.}" iso_publisher="SystemRescue " iso_application="SystemRescue" -install_dir=sysrescue +install_dir=sysresccd work_dir=work out_dir=out gpg_key= @@ -128,7 +128,7 @@ make_setup_mkinitcpio() { exec 17<>${work_dir}/gpgkey fi - ARCHISO_GNUPG_FD=${gpg_key:+17} setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -r 'mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux-lts -g /boot/sysrescue.img' run + ARCHISO_GNUPG_FD=${gpg_key:+17} setarch ${arch} mkarchiso ${verbose} -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" -r 'mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux-lts -g /boot/sysresccd.img' run if [[ ${gpg_key} ]]; then exec 17<&- fi @@ -137,7 +137,7 @@ make_setup_mkinitcpio() { # Prepare kernel/initramfs ${install_dir}/boot/ make_boot() { mkdir -p ${work_dir}/iso/${install_dir}/boot/${arch} - cp ${work_dir}/${arch}/airootfs/boot/sysrescue.img ${work_dir}/iso/${install_dir}/boot/${arch}/sysrescue.img + cp ${work_dir}/${arch}/airootfs/boot/sysresccd.img ${work_dir}/iso/${install_dir}/boot/${arch}/sysresccd.img cp ${work_dir}/${arch}/airootfs/boot/vmlinuz-linux-lts ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz } diff --git a/efiboot/grub/grubsrcd.cfg b/efiboot/grub/grubsrcd.cfg index a7eea68..eb451da 100644 --- a/efiboot/grub/grubsrcd.cfg +++ b/efiboot/grub/grubsrcd.cfg @@ -23,35 +23,35 @@ fi menuentry "Boot SystemRescue using default options" { set gfxpayload=keep linux /%INSTALL_DIR%/boot/%ISO_ARCH%/vmlinuz archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% - initrd /%INSTALL_DIR%/boot/intel_ucode.img /%INSTALL_DIR%/boot/amd_ucode.img /%INSTALL_DIR%/boot/%ISO_ARCH%/sysrescue.img + initrd /%INSTALL_DIR%/boot/intel_ucode.img /%INSTALL_DIR%/boot/amd_ucode.img /%INSTALL_DIR%/boot/%ISO_ARCH%/sysresccd.img } menuentry "Boot SystemRescue and copy system to RAM (copytoram)" { set gfxpayload=keep linux /%INSTALL_DIR%/boot/%ISO_ARCH%/vmlinuz archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram - initrd /%INSTALL_DIR%/boot/intel_ucode.img /%INSTALL_DIR%/boot/amd_ucode.img /%INSTALL_DIR%/boot/%ISO_ARCH%/sysrescue.img + initrd /%INSTALL_DIR%/boot/intel_ucode.img /%INSTALL_DIR%/boot/amd_ucode.img /%INSTALL_DIR%/boot/%ISO_ARCH%/sysresccd.img } menuentry "Boot SystemRescue and verify integrity of the medium (checksum)" { set gfxpayload=keep linux /%INSTALL_DIR%/boot/%ISO_ARCH%/vmlinuz archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% checksum - initrd /%INSTALL_DIR%/boot/intel_ucode.img /%INSTALL_DIR%/boot/amd_ucode.img /%INSTALL_DIR%/boot/%ISO_ARCH%/sysrescue.img + initrd /%INSTALL_DIR%/boot/intel_ucode.img /%INSTALL_DIR%/boot/amd_ucode.img /%INSTALL_DIR%/boot/%ISO_ARCH%/sysresccd.img } menuentry "Boot SystemRescue using basic display drivers (nomodeset)" { set gfxpayload=keep linux /%INSTALL_DIR%/boot/%ISO_ARCH%/vmlinuz archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% nomodeset - initrd /%INSTALL_DIR%/boot/intel_ucode.img /%INSTALL_DIR%/boot/amd_ucode.img /%INSTALL_DIR%/boot/%ISO_ARCH%/sysrescue.img + initrd /%INSTALL_DIR%/boot/intel_ucode.img /%INSTALL_DIR%/boot/amd_ucode.img /%INSTALL_DIR%/boot/%ISO_ARCH%/sysresccd.img } menuentry "Boot a Linux operating system installed on the disk (findroot)" { set gfxpayload=keep linux /%INSTALL_DIR%/boot/%ISO_ARCH%/vmlinuz archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% findroot - initrd /%INSTALL_DIR%/boot/intel_ucode.img /%INSTALL_DIR%/boot/amd_ucode.img /%INSTALL_DIR%/boot/%ISO_ARCH%/sysrescue.img + initrd /%INSTALL_DIR%/boot/intel_ucode.img /%INSTALL_DIR%/boot/amd_ucode.img /%INSTALL_DIR%/boot/%ISO_ARCH%/sysresccd.img } menuentry "Stop during the boot process before mounting the root filesystem" { set gfxpayload=keep linux /%INSTALL_DIR%/boot/%ISO_ARCH%/vmlinuz archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% break - initrd /%INSTALL_DIR%/boot/intel_ucode.img /%INSTALL_DIR%/boot/amd_ucode.img /%INSTALL_DIR%/boot/%ISO_ARCH%/sysrescue.img + initrd /%INSTALL_DIR%/boot/intel_ucode.img /%INSTALL_DIR%/boot/amd_ucode.img /%INSTALL_DIR%/boot/%ISO_ARCH%/sysresccd.img } diff --git a/isolinux/isolinux.cfg b/isolinux/isolinux.cfg index a206d96..9109375 100644 --- a/isolinux/isolinux.cfg +++ b/isolinux/isolinux.cfg @@ -2,5 +2,5 @@ PATH /%INSTALL_DIR%/boot/syslinux/ DEFAULT loadconfig LABEL loadconfig - CONFIG /%INSTALL_DIR%/boot/syslinux/sysrescue.cfg + CONFIG /%INSTALL_DIR%/boot/syslinux/sysresccd.cfg APPEND /%INSTALL_DIR%/ diff --git a/syslinux/syslinux.cfg b/syslinux/syslinux.cfg index cb9f488..1bfdefc 100644 --- a/syslinux/syslinux.cfg +++ b/syslinux/syslinux.cfg @@ -1,5 +1,5 @@ DEFAULT loadconfig LABEL loadconfig - CONFIG sysrescue.cfg + CONFIG sysresccd.cfg APPEND ../../ diff --git a/syslinux/sysrescue.cfg b/syslinux/sysresccd.cfg similarity index 60% rename from syslinux/sysrescue.cfg rename to syslinux/sysresccd.cfg index d716577..cebadfc 100644 --- a/syslinux/sysrescue.cfg +++ b/syslinux/sysresccd.cfg @@ -5,7 +5,7 @@ COM32 boot/syslinux/whichsys.c32 APPEND -pxe- pxe -sys- sys -iso- sys LABEL pxe -CONFIG boot/syslinux/sysrescue_pxe.cfg +CONFIG boot/syslinux/sysresccd_pxe.cfg LABEL sys -CONFIG boot/syslinux/sysrescue_sys.cfg +CONFIG boot/syslinux/sysresccd_sys.cfg diff --git a/syslinux/sysrescue_head.cfg b/syslinux/sysresccd_head.cfg similarity index 100% rename from syslinux/sysrescue_head.cfg rename to syslinux/sysresccd_head.cfg diff --git a/syslinux/sysrescue_pxe.cfg b/syslinux/sysresccd_pxe.cfg similarity index 83% rename from syslinux/sysrescue_pxe.cfg rename to syslinux/sysresccd_pxe.cfg index a353c7a..6215d9d 100644 --- a/syslinux/sysrescue_pxe.cfg +++ b/syslinux/sysresccd_pxe.cfg @@ -1,36 +1,36 @@ -INCLUDE boot/syslinux/sysrescue_head.cfg +INCLUDE boot/syslinux/sysresccd_head.cfg -LABEL sysrescue_nbd +LABEL sysresccd_nbd TEXT HELP Boot the SystemRescue live medium (Using NBD). It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Boot SystemRescue (NBD) LINUX boot/%ISO_ARCH%/vmlinuz -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ISO_ARCH%/sysrescue.img +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ISO_ARCH%/sysresccd.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} SYSAPPEND 3 -LABEL sysrescue_nfs +LABEL sysresccd_nfs TEXT HELP Boot the SystemRescue live medium (Using NFS). It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Boot SystemRescue (NFS) LINUX boot/%ISO_ARCH%/vmlinuz -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ISO_ARCH%/sysrescue.img -APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/sysrescue/bootmnt +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ISO_ARCH%/sysresccd.img +APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/sysresccd/bootmnt SYSAPPEND 3 -LABEL sysrescue_http +LABEL sysresccd_http TEXT HELP Boot the SystemRescue live medium (Using HTTP). It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Boot SystemRescue (HTTP) LINUX boot/%ISO_ARCH%/vmlinuz -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ISO_ARCH%/sysrescue.img +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ISO_ARCH%/sysresccd.img APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ SYSAPPEND 3 -INCLUDE boot/syslinux/sysrescue_tail.cfg +INCLUDE boot/syslinux/sysresccd_tail.cfg diff --git a/syslinux/sysrescue_sys.cfg b/syslinux/sysresccd_sys.cfg similarity index 86% rename from syslinux/sysrescue_sys.cfg rename to syslinux/sysresccd_sys.cfg index eb89cb8..d38ddac 100644 --- a/syslinux/sysrescue_sys.cfg +++ b/syslinux/sysresccd_sys.cfg @@ -1,57 +1,57 @@ -INCLUDE boot/syslinux/sysrescue_head.cfg +INCLUDE boot/syslinux/sysresccd_head.cfg -LABEL sysrescue +LABEL sysresccd TEXT HELP Boot the SystemRescue live medium. ENDTEXT MENU LABEL Boot SystemRescue using default options LINUX boot/%ISO_ARCH%/vmlinuz -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ISO_ARCH%/sysrescue.img +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ISO_ARCH%/sysresccd.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% -LABEL sysrescue_copytoram +LABEL sysresccd_copytoram TEXT HELP Boot the SystemRescue live medium and copy system to RAM ENDTEXT MENU LABEL Boot SystemRescue and copy system to RAM (copytoram) LINUX boot/%ISO_ARCH%/vmlinuz -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ISO_ARCH%/sysrescue.img +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ISO_ARCH%/sysresccd.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram -LABEL sysrescue_checksum +LABEL sysresccd_checksum TEXT HELP Boot SystemRescue and verify the integrity of the live medium ENDTEXT MENU LABEL Boot SystemRescue and verify integrity of the medium (checksum) LINUX boot/%ISO_ARCH%/vmlinuz -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ISO_ARCH%/sysrescue.img +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ISO_ARCH%/sysresccd.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% checksum -LABEL sysrescue_nomodeset +LABEL sysresccd_nomodeset TEXT HELP Boot using basic display drivers to avoid display issues ENDTEXT MENU LABEL Boot SystemRescue using basic display drivers (nomodeset) LINUX boot/%ISO_ARCH%/vmlinuz -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ISO_ARCH%/sysrescue.img +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ISO_ARCH%/sysresccd.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% nomodeset -LABEL sysrescue_findroot +LABEL sysresccd_findroot TEXT HELP Boot from a Linux operating system installed on the disk ENDTEXT MENU LABEL Boot a Linux operating system installed on the disk (findroot) LINUX boot/%ISO_ARCH%/vmlinuz -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ISO_ARCH%/sysrescue.img +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ISO_ARCH%/sysresccd.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% findroot -LABEL sysrescue_break +LABEL sysresccd_break TEXT HELP Stop during the boot process before mounting the root filesystem ENDTEXT MENU LABEL Stop during the boot process before mounting the root filesystem LINUX boot/%ISO_ARCH%/vmlinuz -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ISO_ARCH%/sysrescue.img +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/%ISO_ARCH%/sysresccd.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% break -INCLUDE boot/syslinux/sysrescue_tail.cfg +INCLUDE boot/syslinux/sysresccd_tail.cfg diff --git a/syslinux/sysrescue_tail.cfg b/syslinux/sysresccd_tail.cfg similarity index 100% rename from syslinux/sysrescue_tail.cfg rename to syslinux/sysresccd_tail.cfg