nchevsky/systemrescue-zfs
1
0
Fork 0
mirror of https://github.com/nchevsky/systemrescue-zfs.git synced 2026-01-05 16:20:10 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert original name when related to boot config

Browse source
This commit is contained in:
fdupoux 2020-09-13 20:26:56 +01:00
parent 4e438e7360
commit 51574e9fed
9 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build.sh
View file

@ -11,7 +11,7 @@ iso_mainver="${iso_version%-*}"
iso_label="SYSRES${iso_mainver//.}"
iso_publisher="SystemRescue <http://www.system-rescue.org>"
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
}

12
efiboot/grub/grubsrcd.cfg
View file

@ -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
}

2
isolinux/isolinux.cfg
View file

@ -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%/

2
syslinux/syslinux.cfg
View file

@ -1,5 +1,5 @@
DEFAULT loadconfig
LABEL loadconfig
CONFIG sysrescue.cfg
CONFIG sysresccd.cfg
APPEND ../../

4
syslinux/sysrescue.cfg → syslinux/sysresccd.cfg
View file

@ -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

0
syslinux/sysrescue_head.cfg → syslinux/sysresccd_head.cfg
View file

18
syslinux/sysrescue_pxe.cfg → syslinux/sysresccd_pxe.cfg
View file

@ -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

28
syslinux/sysrescue_sys.cfg → syslinux/sysresccd_sys.cfg
View file

@ -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

0
syslinux/sysrescue_tail.cfg → syslinux/sysresccd_tail.cfg
View file