From 78fe6560420adccf70c50eb9963e133794f7522e Mon Sep 17 00:00:00 2001 From: nl6720 Date: Fri, 17 Jul 2020 12:10:35 +0300 Subject: Deprecate customize_airootfs.sh Show a deprecation notice if airootfs/root/customize_airootfs.sh is found. --- configs/releng/airootfs/root/customize_airootfs.sh | 2 ++ configs/releng/build.sh | 16 +++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) (limited to 'configs') diff --git a/configs/releng/airootfs/root/customize_airootfs.sh b/configs/releng/airootfs/root/customize_airootfs.sh index 5c98fd6..2d7f2e0 100755 --- a/configs/releng/airootfs/root/customize_airootfs.sh +++ b/configs/releng/airootfs/root/customize_airootfs.sh @@ -2,6 +2,8 @@ set -e -u +echo 'Warning: customize_airootfs.sh is deprecated! Support for it will be removed in a future archiso version.' + sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen locale-gen diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 23cae8d..07d2560 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -117,14 +117,16 @@ make_setup_mkinitcpio() { # Customize installation (airootfs) make_customize_airootfs() { - if [ -n "${verbose}" ]; then - mkarchiso -v -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \ - -r '/root/customize_airootfs.sh' run - else - mkarchiso -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \ - -r '/root/customize_airootfs.sh' run + if [[ -e "${work_dir}/x86_64/airootfs/root/customize_airootfs.sh" ]]; then + if [ -n "${verbose}" ]; then + mkarchiso -v -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \ + -r '/root/customize_airootfs.sh' run + else + mkarchiso -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \ + -r '/root/customize_airootfs.sh' run + fi + rm "${work_dir}/x86_64/airootfs/root/customize_airootfs.sh" fi - rm "${work_dir}/x86_64/airootfs/root/customize_airootfs.sh" } # Prepare kernel/initramfs ${install_dir}/boot/ -- cgit v1.2.3-54-g00ecf From b922e8bc9cebbb42a76da4752a10ecba0043917d Mon Sep 17 00:00:00 2001 From: nl6720 Date: Mon, 20 Jul 2020 12:18:16 +0300 Subject: Set up custom user home directories and their permissions --- configs/baseline/build.sh | 14 ++++++++++++++ configs/releng/build.sh | 15 ++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) (limited to 'configs') diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh index f2f3922..6001cd8 100755 --- a/configs/baseline/build.sh +++ b/configs/baseline/build.sh @@ -39,6 +39,20 @@ make_custom_airootfs() { cp -af --no-preserve=ownership -- "${script_path}/airootfs/." "${_airootfs}" [[ -e "${_airootfs}/etc/shadow" ]] && chmod -f 0400 -- "${_airootfs}/etc/shadow" [[ -e "${_airootfs}/etc/gshadow" ]] && chmod -f 0400 -- "${_airootfs}/etc/gshadow" + + # Set up user home directories and permissions + if [[ -e "${_airootfs}/etc/passwd" ]]; then + while IFS=':' read -a passwd -r; do + [[ "${passwd[5]}" == '/' ]] && continue + + if [[ -d "${_airootfs}${passwd[5]}" ]]; then + chown -hR -- "${passwd[2]}:${passwd[3]}" "${_airootfs}${passwd[5]}" + chmod -f 0750 -- "${_airootfs}${passwd[5]}" + else + install -d -m 0750 -o "${passwd[2]}" -g "${passwd[3]}" -- "${_airootfs}${passwd[5]}" + fi + done < "${_airootfs}/etc/passwd" + fi fi } diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 07d2560..310204b 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -69,7 +69,20 @@ make_custom_airootfs() { [[ -e "${_airootfs}/etc/shadow" ]] && chmod -f 0400 -- "${_airootfs}/etc/shadow" [[ -e "${_airootfs}/etc/gshadow" ]] && chmod -f 0400 -- "${_airootfs}/etc/gshadow" - [[ -e "${_airootfs}/root" ]] && chmod -f 0750 -- "${_airootfs}/root" + + # Set up user home directories and permissions + if [[ -e "${_airootfs}/etc/passwd" ]]; then + while IFS=':' read -a passwd -r; do + [[ "${passwd[5]}" == '/' ]] && continue + + if [[ -d "${_airootfs}${passwd[5]}" ]]; then + chown -hR -- "${passwd[2]}:${passwd[3]}" "${_airootfs}${passwd[5]}" + chmod -f 0750 -- "${_airootfs}${passwd[5]}" + else + install -d -m 0750 -o "${passwd[2]}" -g "${passwd[3]}" -- "${_airootfs}${passwd[5]}" + fi + done < "${_airootfs}/etc/passwd" + fi fi } -- cgit v1.2.3-54-g00ecf From ba6b44f80a4a48c0b66068a32a8596b4d4fc28d8 Mon Sep 17 00:00:00 2001 From: nl6720 Date: Mon, 20 Jul 2020 15:54:11 +0300 Subject: Copy /etc/skel/ to user's home from build.sh instead of customize_airootfs.sh Additionally copy the files to all custom user homes, not just root's. --- configs/releng/airootfs/root/customize_airootfs.sh | 2 -- configs/releng/build.sh | 11 ++++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'configs') diff --git a/configs/releng/airootfs/root/customize_airootfs.sh b/configs/releng/airootfs/root/customize_airootfs.sh index 2d7f2e0..3f81617 100755 --- a/configs/releng/airootfs/root/customize_airootfs.sh +++ b/configs/releng/airootfs/root/customize_airootfs.sh @@ -7,7 +7,5 @@ echo 'Warning: customize_airootfs.sh is deprecated! Support for it will be remov sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen locale-gen -cp -aT /etc/skel/ /root/ - sed -i 's/#\(PermitRootLogin \).\+/\1yes/' /etc/ssh/sshd_config sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 310204b..98f48b0 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -130,6 +130,15 @@ make_setup_mkinitcpio() { # Customize installation (airootfs) make_customize_airootfs() { + if [[ -e "${script_path}/airootfs/etc/passwd" ]]; then + while IFS=':' read -a passwd -r; do + [[ "${passwd[5]}" == '/' ]] && continue + cp -RdT --preserve=mode,timestamps,links -- "${work_dir}/x86_64/airootfs/etc/skel" "${work_dir}/x86_64/airootfs${passwd[5]}" + chown -hR -- "${passwd[2]}:${passwd[3]}" "${work_dir}/x86_64/airootfs${passwd[5]}" + + done < "${script_path}/airootfs/etc/passwd" + fi + if [[ -e "${work_dir}/x86_64/airootfs/root/customize_airootfs.sh" ]]; then if [ -n "${verbose}" ]; then mkarchiso -v -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \ @@ -305,8 +314,8 @@ mkdir -p "${work_dir}" run_once make_pacman_conf run_once make_custom_airootfs run_once make_packages -run_once make_setup_mkinitcpio run_once make_customize_airootfs +run_once make_setup_mkinitcpio run_once make_boot run_once make_boot_extra run_once make_syslinux -- cgit v1.2.3-54-g00ecf From 47e11125e4672fc3448caefa6728439160daedd3 Mon Sep 17 00:00:00 2001 From: David Runge Date: Tue, 28 Jul 2020 11:38:04 +0200 Subject: Copy files more generically configs/*: Copy all files that do not need a rename generically (not specifying a destination file name). Do not rename vmlinuz-linux to vmlinuz or vmlinuz.efi (as this serves no purpose and makes the scripts more complicated). Do not rename microcode (i.e. {amd,intel}-ucode.img) when copying them and change all boot loader configuration files that assume a renamed microcode image. Add note and link to Arch Linux wiki to state why memtest.bin is renamed to memtest. Copy license files for {amd,intel}-ucode and memtest more generically by placing them into subdirectories with the same name as the package (to circumenvent overwriting one other). Closes #33 --- configs/baseline/build.sh | 2 +- configs/baseline/syslinux/syslinux.cfg | 2 +- configs/releng/build.sh | 38 ++++++++++++---------- .../efiboot/loader/entries/archiso-x86_64-cd.conf | 6 ++-- .../efiboot/loader/entries/archiso-x86_64-usb.conf | 6 ++-- configs/releng/syslinux/archiso_pxe.cfg | 12 +++---- configs/releng/syslinux/archiso_sys.cfg | 4 +-- 7 files changed, 37 insertions(+), 33 deletions(-) (limited to 'configs') diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh index 6001cd8..0649d4b 100755 --- a/configs/baseline/build.sh +++ b/configs/baseline/build.sh @@ -77,7 +77,7 @@ make_setup_mkinitcpio() { make_boot() { mkdir -p "${work_dir}/iso/${install_dir}/boot/${arch}" cp "${work_dir}/airootfs/boot/archiso.img" "${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img" - cp "${work_dir}/airootfs/boot/vmlinuz-linux" "${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz" + cp "${work_dir}/airootfs/boot/vmlinuz-linux" "${work_dir}/iso/${install_dir}/boot/${arch}/" } # Prepare /${install_dir}/boot/syslinux diff --git a/configs/baseline/syslinux/syslinux.cfg b/configs/baseline/syslinux/syslinux.cfg index 4f7ce4d..e31bb8c 100644 --- a/configs/baseline/syslinux/syslinux.cfg +++ b/configs/baseline/syslinux/syslinux.cfg @@ -7,6 +7,6 @@ TIMEOUT 30 LABEL arch MENU LABEL Arch Linux -LINUX boot/%ARCH%/vmlinuz +LINUX boot/%ARCH%/vmlinuz-linux INITRD boot/%ARCH%/archiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 98f48b0..fd28487 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -154,26 +154,30 @@ make_customize_airootfs() { # Prepare kernel/initramfs ${install_dir}/boot/ make_boot() { mkdir -p "${work_dir}/iso/${install_dir}/boot/x86_64" - cp "${work_dir}/x86_64/airootfs/boot/archiso.img" "${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img" - cp "${work_dir}/x86_64/airootfs/boot/vmlinuz-linux" "${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz" + cp "${work_dir}/x86_64/airootfs/boot/archiso.img" "${work_dir}/iso/${install_dir}/boot/x86_64/" + cp "${work_dir}/x86_64/airootfs/boot/vmlinuz-linux" "${work_dir}/iso/${install_dir}/boot/x86_64/" } # Add other aditional/extra files to ${install_dir}/boot/ make_boot_extra() { if [[ -e "${work_dir}/x86_64/airootfs/boot/memtest86+/memtest.bin" ]]; then + # rename for PXE: https://wiki.archlinux.org/index.php/Syslinux#Using_memtest cp "${work_dir}/x86_64/airootfs/boot/memtest86+/memtest.bin" "${work_dir}/iso/${install_dir}/boot/memtest" + mkdir -p "${work_dir}/iso/${install_dir}/boot/licenses/memtest86+/" cp "${work_dir}/x86_64/airootfs/usr/share/licenses/common/GPL2/license.txt" \ - "${work_dir}/iso/${install_dir}/boot/memtest.COPYING" + "${work_dir}/iso/${install_dir}/boot/licenses/memtest86+/" fi if [[ -e "${work_dir}/x86_64/airootfs/boot/intel-ucode.img" ]]; then - cp "${work_dir}/x86_64/airootfs/boot/intel-ucode.img" "${work_dir}/iso/${install_dir}/boot/intel_ucode.img" - cp "${work_dir}/x86_64/airootfs/usr/share/licenses/intel-ucode/LICENSE" \ - "${work_dir}/iso/${install_dir}/boot/intel_ucode.LICENSE" + cp "${work_dir}/x86_64/airootfs/boot/intel-ucode.img" "${work_dir}/iso/${install_dir}/boot/" + mkdir -p "${work_dir}/iso/${install_dir}/boot/licenses/intel-ucode/" + cp "${work_dir}/x86_64/airootfs/usr/share/licenses/intel-ucode/"* \ + "${work_dir}/iso/${install_dir}/boot/licenses/intel-ucode/" fi if [[ -e "${work_dir}/x86_64/airootfs/boot/amd-ucode.img" ]]; then - cp "${work_dir}/x86_64/airootfs/boot/amd-ucode.img" "${work_dir}/iso/${install_dir}/boot/amd_ucode.img" - cp "${work_dir}/x86_64/airootfs/usr/share/licenses/amd-ucode/LICENSE" \ - "${work_dir}/iso/${install_dir}/boot/amd_ucode.LICENSE" + cp "${work_dir}/x86_64/airootfs/boot/amd-ucode.img" "${work_dir}/iso/${install_dir}/boot/" + mkdir -p "${work_dir}/iso/${install_dir}/boot/licenses/amd-ucode/" + cp "${work_dir}/x86_64/airootfs/usr/share/licenses/amd-ucode/"* \ + "${work_dir}/iso/${install_dir}/boot/licenses/amd-ucode/" fi } @@ -185,10 +189,10 @@ make_syslinux() { sed "s|%ARCHISO_LABEL%|${iso_label}|g; s|%INSTALL_DIR%|${install_dir}|g" "${_cfg}" > "${work_dir}/iso/${install_dir}/boot/syslinux/${_cfg##*/}" done - cp "${script_path}/syslinux/splash.png" "${work_dir}/iso/${install_dir}/boot/syslinux" - cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/"*.c32 "${work_dir}/iso/${install_dir}/boot/syslinux" - cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/lpxelinux.0" "${work_dir}/iso/${install_dir}/boot/syslinux" - cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/memdisk" "${work_dir}/iso/${install_dir}/boot/syslinux" + cp "${script_path}/syslinux/splash.png" "${work_dir}/iso/${install_dir}/boot/syslinux/" + cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/"*.c32 "${work_dir}/iso/${install_dir}/boot/syslinux/" + cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/lpxelinux.0" "${work_dir}/iso/${install_dir}/boot/syslinux/" + cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/memdisk" "${work_dir}/iso/${install_dir}/boot/syslinux/" mkdir -p "${work_dir}/iso/${install_dir}/boot/syslinux/hdt" gzip -c -9 "${work_dir}/x86_64/airootfs/usr/share/hwdata/pci.ids" > \ "${work_dir}/iso/${install_dir}/boot/syslinux/hdt/pciids.gz" @@ -235,11 +239,11 @@ make_efiboot() { mount "${work_dir}/iso/EFI/archiso/efiboot.img" "${work_dir}/efiboot" mkdir -p "${work_dir}/efiboot/EFI/archiso" - cp "${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz" "${work_dir}/efiboot/EFI/archiso/vmlinuz.efi" - cp "${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img" "${work_dir}/efiboot/EFI/archiso/archiso.img" + cp "${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz-linux" "${work_dir}/efiboot/EFI/archiso/" + cp "${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img" "${work_dir}/efiboot/EFI/archiso/" - cp "${work_dir}/iso/${install_dir}/boot/intel_ucode.img" "${work_dir}/efiboot/EFI/archiso/intel_ucode.img" - cp "${work_dir}/iso/${install_dir}/boot/amd_ucode.img" "${work_dir}/efiboot/EFI/archiso/amd_ucode.img" + cp "${work_dir}/iso/${install_dir}/boot/intel-ucode.img" "${work_dir}/efiboot/EFI/archiso/" + cp "${work_dir}/iso/${install_dir}/boot/amd-ucode.img" "${work_dir}/efiboot/EFI/archiso/" mkdir -p "${work_dir}/efiboot/EFI/boot" cp "${work_dir}/x86_64/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \ diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf index 7f5c81b..b660f1d 100644 --- a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf +++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf @@ -1,6 +1,6 @@ title Arch Linux install medium (x86_64, UEFI) -linux /EFI/archiso/vmlinuz.efi -initrd /EFI/archiso/intel_ucode.img -initrd /EFI/archiso/amd_ucode.img +linux /EFI/archiso/vmlinuz-linux +initrd /EFI/archiso/intel-ucode.img +initrd /EFI/archiso/amd-ucode.img initrd /EFI/archiso/archiso.img options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf index e1d156a..78c7d23 100644 --- a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf +++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf @@ -1,6 +1,6 @@ title Arch Linux install medium (x86_64, UEFI) -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz -initrd /%INSTALL_DIR%/boot/intel_ucode.img -initrd /%INSTALL_DIR%/boot/amd_ucode.img +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux +initrd /%INSTALL_DIR%/boot/intel-ucode.img +initrd /%INSTALL_DIR%/boot/amd-ucode.img initrd /%INSTALL_DIR%/boot/x86_64/archiso.img options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/configs/releng/syslinux/archiso_pxe.cfg b/configs/releng/syslinux/archiso_pxe.cfg index 3ae0948..45a8a17 100644 --- a/configs/releng/syslinux/archiso_pxe.cfg +++ b/configs/releng/syslinux/archiso_pxe.cfg @@ -6,8 +6,8 @@ Boot the Arch Linux install medium using NBD. It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Arch Linux install medium (x86_64, NBD) -LINUX boot/x86_64/vmlinuz -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +LINUX boot/x86_64/vmlinuz-linux +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 @@ -17,8 +17,8 @@ Boot the Arch Linux live medium using NFS. It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Arch Linux install medium (x86_64, NFS) -LINUX boot/x86_64/vmlinuz -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +LINUX boot/x86_64/vmlinuz-linux +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 @@ -28,8 +28,8 @@ Boot the Arch Linux live medium using HTTP. It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Arch Linux install medium (x86_64, HTTP) -LINUX boot/x86_64/vmlinuz -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +LINUX boot/x86_64/vmlinuz-linux +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 diff --git a/configs/releng/syslinux/archiso_sys.cfg b/configs/releng/syslinux/archiso_sys.cfg index 5fd4e8f..fbf3772 100644 --- a/configs/releng/syslinux/archiso_sys.cfg +++ b/configs/releng/syslinux/archiso_sys.cfg @@ -9,8 +9,8 @@ Boot the Arch Linux install medium on BIOS. It allows you to install Arch Linux or perform system maintenance. ENDTEXT MENU LABEL Arch Linux install medium (x86_64, BIOS) -LINUX boot/x86_64/vmlinuz -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +LINUX boot/x86_64/vmlinuz-linux +INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/archiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% INCLUDE boot/syslinux/archiso_tail.cfg -- cgit v1.2.3-54-g00ecf From e264b44682a930f70715ea58cf96e69c87a86b64 Mon Sep 17 00:00:00 2001 From: David Runge Date: Sat, 30 May 2020 00:01:28 +0200 Subject: Add license and basic documentation LICENSE: Add GPL-3.0 license. {{archiso,configs}/*,.editorconfig,.gitlab-ci.yml}: Add SPDX license identifier. Makefile: Add SPDX license identifier. Install the `run_archiso.sh` script as global executable `run_archiso`. Use -D and -t flags to install to install files more generically (without a previous call to install the directory). README.rst: Add README outlining the project's scope, how to build images from the profiles and how to test. AUTHORS.rst: Add list of all direct contributors to the repository. CONTRIBUTING.rst: Add basic contribution guidelines, explaining the linter and the license in use. Closes #7 Closes #3 --- .editorconfig | 14 +- .gitlab-ci.yml | 2 + AUTHORS.rst | 33 + CONTRIBUTING.rst | 26 + LICENSE | 674 +++++++++++++++++++++ Makefile | 11 +- README.rst | 118 ++++ archiso/initcpio/hooks/archiso | 2 + archiso/initcpio/hooks/archiso_loop_mnt | 2 + archiso/initcpio/hooks/archiso_pxe_common | 2 + archiso/initcpio/hooks/archiso_pxe_http | 2 + archiso/initcpio/hooks/archiso_pxe_nbd | 2 + archiso/initcpio/hooks/archiso_pxe_nfs | 2 + archiso/initcpio/hooks/archiso_shutdown | 2 + archiso/initcpio/install/archiso | 2 + archiso/initcpio/install/archiso_kms | 2 + archiso/initcpio/install/archiso_loop_mnt | 2 + archiso/initcpio/install/archiso_pxe_common | 2 + archiso/initcpio/install/archiso_pxe_http | 2 + archiso/initcpio/install/archiso_pxe_nbd | 2 + archiso/initcpio/install/archiso_pxe_nfs | 2 + archiso/initcpio/install/archiso_shutdown | 2 + archiso/initcpio/script/archiso_shutdown | 2 + archiso/mkarchiso | 2 + configs/baseline/build.sh | 2 + configs/baseline/isolinux/isolinux.cfg | 3 + configs/baseline/mkinitcpio.conf | 3 + configs/baseline/packages.x86_64 | 2 + configs/baseline/pacman.conf | 2 + configs/baseline/syslinux/syslinux.cfg | 3 + configs/releng/airootfs/etc/fstab | 2 + configs/releng/airootfs/etc/hostname | 2 + configs/releng/airootfs/etc/locale.conf | 3 + .../systemd/journald.conf.d/volatile-storage.conf | 3 + .../etc/systemd/logind.conf.d/do-not-suspend.conf | 3 + .../etc/systemd/network/20-ethernet.network | 3 + .../etc/systemd/network/20-wireless.network | 3 + .../etc/systemd/system/choose-mirror.service | 3 + .../etc/systemd/system/etc-pacman.d-gnupg.mount | 3 + .../system/getty@tty1.service.d/autologin.conf | 3 + .../etc/systemd/system/pacman-init.service | 3 + .../airootfs/etc/systemd/system/reflector.service | 3 + .../wait-for-only-one-interface.conf | 3 + configs/releng/airootfs/root/customize_airootfs.sh | 2 + .../airootfs/usr/local/bin/Installation_guide | 2 + .../releng/airootfs/usr/local/bin/choose-mirror | 2 + configs/releng/build.sh | 2 + .../efiboot/loader/entries/archiso-x86_64-cd.conf | 3 + .../efiboot/loader/entries/archiso-x86_64-usb.conf | 3 + configs/releng/efiboot/loader/loader.conf | 3 + configs/releng/isolinux/isolinux.cfg | 3 + configs/releng/mkinitcpio.conf | 3 + configs/releng/packages.x86_64 | 2 + configs/releng/pacman.conf | 2 + configs/releng/syslinux/archiso.cfg | 3 + configs/releng/syslinux/archiso_head.cfg | 3 + configs/releng/syslinux/archiso_pxe.cfg | 3 + configs/releng/syslinux/archiso_sys.cfg | 3 + configs/releng/syslinux/archiso_tail.cfg | 3 + 59 files changed, 1000 insertions(+), 6 deletions(-) create mode 100644 AUTHORS.rst create mode 100644 CONTRIBUTING.rst create mode 100644 LICENSE create mode 100644 README.rst (limited to 'configs') diff --git a/.editorconfig b/.editorconfig index 4a540f3..74ed4eb 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,5 +1,7 @@ -# EditorConfig configuration for archiso -# http://EditorConfig.org +# EditorConfig for archiso +# https://editorconfig.org/ +# +# SPDX-License-Identifier: GPL-3.0-or-later # Top-most EditorConfig file root = true @@ -22,3 +24,11 @@ trim_trailing_whitespace = true charset = utf-8 indent_style = space indent_size = 2 + +[*.rst] +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true +charset = utf-8 +indent_style = space +indent_size = 2 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e69ab5e..d85b887 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,6 @@ --- +# +# SPDX-License-Identifier: GPL-3.0-or-later default: image: archlinux/base diff --git a/AUTHORS.rst b/AUTHORS.rst new file mode 100644 index 0000000..4fe0eb5 --- /dev/null +++ b/AUTHORS.rst @@ -0,0 +1,33 @@ +=============== +Archiso Authors +=============== + +* Aaron Griffin +* Adam Purkrt +* Chandan Singh +* Charles Vejnar +* Christian Hesse +* Christopher Brannon +* Dan McGee +* David Runge +* David Thurstenson +* Dieter Plaetinck +* Eli Schwartz +* Florian Pritz +* Gerardo Exequiel Pozzi +* Gerhard Brauer +* James Sitegen +* Justin Kromlinger +* Keshav Amburay +* Loui Chang +* Lukas Fleischer +* Martin Damian Fernandez +* Pierre Schmitz +* Sean Enck +* Simo Leone +* Steffen Bönigk +* Sven-Hendrik Haase +* Thomas Bächler +* Yu Li-Yu +* nl6720 +* Øyvind Heggstad diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst new file mode 100644 index 0000000..5073aa0 --- /dev/null +++ b/CONTRIBUTING.rst @@ -0,0 +1,26 @@ +============ +Contributing +============ + +These are the contribution guidelines for archiso. +All contributions fall under the terms of the GPL-3.0-or-later (see `LICENSE `_). + +Editorconfig +============ + +A top-level editorconfig file is provided. Please configure your text editor to use it. + +Linting +======= + +All ash and bash scripts are linted using shellcheck: + + .. code:: bash + + make check + +Testing +======= + +Contributors are expected to test their contributions by building the releng profile and running the resulting image +using `run_archiso `_. diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/Makefile b/Makefile index 3ee8a6a..a274282 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + INSTALL_FILES=$(wildcard archiso/initcpio/install/*) HOOKS_FILES=$(wildcard archiso/initcpio/hooks/*) SCRIPT_FILES=$(wildcard archiso/initcpio/script/*) @@ -6,7 +9,7 @@ INSTALL_DIR=$(DESTDIR)/usr/lib/initcpio/install HOOKS_DIR=$(DESTDIR)/usr/lib/initcpio/hooks SCRIPT_DIR=$(DESTDIR)/usr/lib/initcpio -DOC_FILES=$(wildcard docs/*) +DOC_FILES=$(wildcard docs/*) $(wildcard *.rst) DOC_DIR=$(DESTDIR)/usr/share/doc/archiso @@ -25,7 +28,8 @@ check: install: install-program install-initcpio install-examples install-doc install-program: - install -D -m 755 archiso/mkarchiso $(DESTDIR)/usr/bin/mkarchiso + install -vDm 755 archiso/mkarchiso -t "$(DESTDIR)/usr/bin/" + install -vDm 755 scripts/run_archiso.sh "$(DESTDIR)/usr/bin/run_archiso" install-initcpio: install -d $(SCRIPT_DIR) $(HOOKS_DIR) $(INSTALL_DIR) @@ -38,7 +42,6 @@ install-examples: cp -a --no-preserve=ownership configs $(DESTDIR)/usr/share/archiso/ install-doc: - install -d $(DOC_DIR) - install -m 644 -t $(DOC_DIR) $(DOC_FILES) + install -vDm 644 $(DOC_FILES) -t $(DOC_DIR) .PHONY: check install install-program install-initcpio install-examples install-doc diff --git a/README.rst b/README.rst new file mode 100644 index 0000000..7ad0d41 --- /dev/null +++ b/README.rst @@ -0,0 +1,118 @@ +======= +archiso +======= + +The archiso project features scripts and configuration templates to build installation media (*.iso* images) for BIOS +and UEFI based systems on the x86_64 architecture. +Currently creating the images is only supported on Arch Linux. + +Requirements +============ + +The following packages need to be installed to be able to create an image with the included scripts: + +* arch-install-scripts +* dosfstools +* e2fsprogs +* edk2-shell +* libisoburn +* squashfs-tools + +For running the images in a virtualized test environment the following packages are required: + +* edk2-ovmf +* qemu + +For linting the shell scripts the following package is required: + +* shellcheck + +Profiles +======== + +Archiso comes with two profiles: **baseline** and **releng**. While both can serve as starting points for creating +custom live media, **releng** is used to create the monthly installation medium. +They can be found below `configs/baseline/ `_ and `configs/releng/ `_ +(respectively). Both profiles are defined by files to be placed into overlays (e.g. *airootfs* -> *the image's /*) and +dynamic actions (i.e. *build.sh* scripts). + +Create images +============= + +Usually the archiso tools are installed as a package. However, it is also possible to clone this repository and create +images without installing archiso system-wide. + +As filesystems are created and various mount actions have to be done when creating an image, **root** is required to run +the scripts. + +When archiso is installed system-wide and the modification of a profile is desired, it is necessary to copy it to a +writeable location, as */usr/share/archiso* is tracked by the package manager and only writeable by root (changes will +be lost on update). + +The examples below will assume an unmodified profile in a system location (unless noted otherwise). + +It is advised to check the help information of the **build.sh** scripts in the profiles: + + .. code:: bash + + /usr/share/archiso/configs/releng/build.sh --help + +Create images with packaged archiso +----------------------------------- + + .. code:: bash + + /usr/share/archiso/configs/releng/build.sh -w path/to/work_dir -o path/to/out_dir + +Create images with local clone +------------------------------ + +Clone this repository and make sure to run with the local `mkarchiso `_ script in *PATH* (if it has +been modified): + + .. code:: bash + + PATH="archiso:$PATH" ./configs/releng/build.sh -w path/to/work_dir -o path/to/out_dir + +Testing +======= + +The convenience script **run_archiso** is provided to boot into the medium using qemu. +It is advised to read its help information: + + .. code:: bash + + run_archiso -h + +Run the following to boot the iso using BIOS: + + .. code:: bash + + run_archiso -i path/to/an/arch.iso + +Run the following to boot the iso using UEFI: + + .. code:: bash + + run_archiso -i path/to/an/arch.iso -u + +The script can of course also be executed from this repository: + + + .. code:: bash + + ./scripts/run_archiso.sh -i path/to/an/arch.iso + +Installation +============ + +To install archiso system-wide use the included **Makefile**: + + .. code:: bash + + make install + +License +======= + +Archiso is licensed under the terms of the **GPL-3.0-or-later** (see `LICENSE `_). diff --git a/archiso/initcpio/hooks/archiso b/archiso/initcpio/hooks/archiso index 7f2f9a7..a12c260 100644 --- a/archiso/initcpio/hooks/archiso +++ b/archiso/initcpio/hooks/archiso @@ -1,4 +1,6 @@ #!/bin/ash +# +# SPDX-License-Identifier: GPL-3.0-or-later # args: source, newroot, mountpoint _mnt_dmsnapshot() { diff --git a/archiso/initcpio/hooks/archiso_loop_mnt b/archiso/initcpio/hooks/archiso_loop_mnt index 2c607f5..41899e4 100644 --- a/archiso/initcpio/hooks/archiso_loop_mnt +++ b/archiso/initcpio/hooks/archiso_loop_mnt @@ -1,4 +1,6 @@ #!/bin/ash +# +# SPDX-License-Identifier: GPL-3.0-or-later run_hook () { # shellcheck disable=SC2154 diff --git a/archiso/initcpio/hooks/archiso_pxe_common b/archiso/initcpio/hooks/archiso_pxe_common index bf8e883..f02ef12 100644 --- a/archiso/initcpio/hooks/archiso_pxe_common +++ b/archiso/initcpio/hooks/archiso_pxe_common @@ -1,4 +1,6 @@ #!/bin/ash +# +# SPDX-License-Identifier: GPL-3.0-or-later run_hook () { # Do *not* declare 'bootif_dev' local! We need it in run_latehook(). diff --git a/archiso/initcpio/hooks/archiso_pxe_http b/archiso/initcpio/hooks/archiso_pxe_http index bf2f5f4..efae923 100644 --- a/archiso/initcpio/hooks/archiso_pxe_http +++ b/archiso/initcpio/hooks/archiso_pxe_http @@ -1,4 +1,6 @@ #!/bin/ash +# +# SPDX-License-Identifier: GPL-3.0-or-later run_hook() { # shellcheck disable=SC2154 diff --git a/archiso/initcpio/hooks/archiso_pxe_nbd b/archiso/initcpio/hooks/archiso_pxe_nbd index 4ccbcbf..8ac44e7 100644 --- a/archiso/initcpio/hooks/archiso_pxe_nbd +++ b/archiso/initcpio/hooks/archiso_pxe_nbd @@ -1,4 +1,6 @@ #!/bin/ash +# +# SPDX-License-Identifier: GPL-3.0-or-later run_earlyhook() { # shellcheck disable=SC2154 diff --git a/archiso/initcpio/hooks/archiso_pxe_nfs b/archiso/initcpio/hooks/archiso_pxe_nfs index be1e4c3..9d3964b 100644 --- a/archiso/initcpio/hooks/archiso_pxe_nfs +++ b/archiso/initcpio/hooks/archiso_pxe_nfs @@ -1,4 +1,6 @@ #!/bin/ash +# +# SPDX-License-Identifier: GPL-3.0-or-later run_hook() { # shellcheck disable=SC2154 diff --git a/archiso/initcpio/hooks/archiso_shutdown b/archiso/initcpio/hooks/archiso_shutdown index db8fb33..ebb6b11 100644 --- a/archiso/initcpio/hooks/archiso_shutdown +++ b/archiso/initcpio/hooks/archiso_shutdown @@ -1,4 +1,6 @@ #!/bin/ash +# +# SPDX-License-Identifier: GPL-3.0-or-later run_cleanuphook() { rm -rf /usr/lib/modules diff --git a/archiso/initcpio/install/archiso b/archiso/initcpio/install/archiso index a12104e..3006b5f 100644 --- a/archiso/initcpio/install/archiso +++ b/archiso/initcpio/install/archiso @@ -1,4 +1,6 @@ #!/usr/bin/env bash +# +# SPDX-License-Identifier: GPL-3.0-or-later build() { add_module "cdrom" diff --git a/archiso/initcpio/install/archiso_kms b/archiso/initcpio/install/archiso_kms index 48832ff..8129127 100644 --- a/archiso/initcpio/install/archiso_kms +++ b/archiso/initcpio/install/archiso_kms @@ -1,4 +1,6 @@ #!/usr/bin/env bash +# +# SPDX-License-Identifier: GPL-3.0-or-later build() { add_module "amdgpu" diff --git a/archiso/initcpio/install/archiso_loop_mnt b/archiso/initcpio/install/archiso_loop_mnt index 4a5824d..1f2c529 100644 --- a/archiso/initcpio/install/archiso_loop_mnt +++ b/archiso/initcpio/install/archiso_loop_mnt @@ -1,4 +1,6 @@ #!/usr/bin/env bash +# +# SPDX-License-Identifier: GPL-3.0-or-later build() { add_runscript diff --git a/archiso/initcpio/install/archiso_pxe_common b/archiso/initcpio/install/archiso_pxe_common index da5f6b6..458fa69 100644 --- a/archiso/initcpio/install/archiso_pxe_common +++ b/archiso/initcpio/install/archiso_pxe_common @@ -1,4 +1,6 @@ #!/usr/bin/env bash +# +# SPDX-License-Identifier: GPL-3.0-or-later build() { add_checked_modules -f "(irda|phy|wimax|wireless|ppp_|plip|pppoe)" "/drivers/net/" diff --git a/archiso/initcpio/install/archiso_pxe_http b/archiso/initcpio/install/archiso_pxe_http index 3353eb7..1e80852 100644 --- a/archiso/initcpio/install/archiso_pxe_http +++ b/archiso/initcpio/install/archiso_pxe_http @@ -1,4 +1,6 @@ #!/usr/bin/env bash +# +# SPDX-License-Identifier: GPL-3.0-or-later build() { add_runscript diff --git a/archiso/initcpio/install/archiso_pxe_nbd b/archiso/initcpio/install/archiso_pxe_nbd index 9fe3fdd..b4fb3b6 100644 --- a/archiso/initcpio/install/archiso_pxe_nbd +++ b/archiso/initcpio/install/archiso_pxe_nbd @@ -1,4 +1,6 @@ #!/usr/bin/env bash +# +# SPDX-License-Identifier: GPL-3.0-or-later build() { add_module "nbd" diff --git a/archiso/initcpio/install/archiso_pxe_nfs b/archiso/initcpio/install/archiso_pxe_nfs index fa4e548..efd609d 100644 --- a/archiso/initcpio/install/archiso_pxe_nfs +++ b/archiso/initcpio/install/archiso_pxe_nfs @@ -1,4 +1,6 @@ #!/usr/bin/env bash +# +# SPDX-License-Identifier: GPL-3.0-or-later build() { add_module "nfs" diff --git a/archiso/initcpio/install/archiso_shutdown b/archiso/initcpio/install/archiso_shutdown index 1051d1b..b2c6bd4 100644 --- a/archiso/initcpio/install/archiso_shutdown +++ b/archiso/initcpio/install/archiso_shutdown @@ -1,4 +1,6 @@ #!/usr/bin/env bash +# +# SPDX-License-Identifier: GPL-3.0-or-later build() { add_binary cp diff --git a/archiso/initcpio/script/archiso_shutdown b/archiso/initcpio/script/archiso_shutdown index 4a0c7dc..23a8a79 100644 --- a/archiso/initcpio/script/archiso_shutdown +++ b/archiso/initcpio/script/archiso_shutdown @@ -1,4 +1,6 @@ #!/bin/ash +# +# SPDX-License-Identifier: GPL-3.0-or-later # /oldroot depends on things inside /oldroot/run/archiso... mkdir /oldrun diff --git a/archiso/mkarchiso b/archiso/mkarchiso index 5e229a4..ad5232a 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -1,4 +1,6 @@ #!/bin/bash +# +# SPDX-License-Identifier: GPL-3.0-or-later set -e -u diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh index 0649d4b..92d1249 100755 --- a/configs/baseline/build.sh +++ b/configs/baseline/build.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +# +# SPDX-License-Identifier: GPL-3.0-or-later set -e -u diff --git a/configs/baseline/isolinux/isolinux.cfg b/configs/baseline/isolinux/isolinux.cfg index 33e8b65..e078ce3 100644 --- a/configs/baseline/isolinux/isolinux.cfg +++ b/configs/baseline/isolinux/isolinux.cfg @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + PATH /%INSTALL_DIR%/boot/syslinux/ DEFAULT loadconfig diff --git a/configs/baseline/mkinitcpio.conf b/configs/baseline/mkinitcpio.conf index 279eccb..2f9a39a 100644 --- a/configs/baseline/mkinitcpio.conf +++ b/configs/baseline/mkinitcpio.conf @@ -1 +1,4 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + HOOKS=(base udev archiso block filesystems) diff --git a/configs/baseline/packages.x86_64 b/configs/baseline/packages.x86_64 index d3ad7bf..14fe5f0 100644 --- a/configs/baseline/packages.x86_64 +++ b/configs/baseline/packages.x86_64 @@ -1,3 +1,5 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later base linux mkinitcpio diff --git a/configs/baseline/pacman.conf b/configs/baseline/pacman.conf index bbca42f..9d895e9 100644 --- a/configs/baseline/pacman.conf +++ b/configs/baseline/pacman.conf @@ -2,6 +2,8 @@ # /etc/pacman.conf # # See the pacman.conf(5) manpage for option and repository directives +# +# SPDX-License-Identifier: GPL-3.0-or-later # # GENERAL OPTIONS diff --git a/configs/baseline/syslinux/syslinux.cfg b/configs/baseline/syslinux/syslinux.cfg index e31bb8c..a3908da 100644 --- a/configs/baseline/syslinux/syslinux.cfg +++ b/configs/baseline/syslinux/syslinux.cfg @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + UI boot/syslinux/menu.c32 MENU TITLE Arch Linux MENU CLEAR diff --git a/configs/releng/airootfs/etc/fstab b/configs/releng/airootfs/etc/fstab index e69de29..3988279 100644 --- a/configs/releng/airootfs/etc/fstab +++ b/configs/releng/airootfs/etc/fstab @@ -0,0 +1,2 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later diff --git a/configs/releng/airootfs/etc/hostname b/configs/releng/airootfs/etc/hostname index 2dbe21e..a5f866b 100644 --- a/configs/releng/airootfs/etc/hostname +++ b/configs/releng/airootfs/etc/hostname @@ -1 +1,3 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later archiso diff --git a/configs/releng/airootfs/etc/locale.conf b/configs/releng/airootfs/etc/locale.conf index 01ec548..9bf7aef 100644 --- a/configs/releng/airootfs/etc/locale.conf +++ b/configs/releng/airootfs/etc/locale.conf @@ -1 +1,4 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + LANG=en_US.UTF-8 diff --git a/configs/releng/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf b/configs/releng/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf index b69850d..3104779 100644 --- a/configs/releng/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf +++ b/configs/releng/airootfs/etc/systemd/journald.conf.d/volatile-storage.conf @@ -1,2 +1,5 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Journal] Storage=volatile diff --git a/configs/releng/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf b/configs/releng/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf index f3ecb39..c6b17a4 100644 --- a/configs/releng/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf +++ b/configs/releng/airootfs/etc/systemd/logind.conf.d/do-not-suspend.conf @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Login] HandleSuspendKey=ignore HandleHibernateKey=ignore diff --git a/configs/releng/airootfs/etc/systemd/network/20-ethernet.network b/configs/releng/airootfs/etc/systemd/network/20-ethernet.network index 37878b0..efa309c 100644 --- a/configs/releng/airootfs/etc/systemd/network/20-ethernet.network +++ b/configs/releng/airootfs/etc/systemd/network/20-ethernet.network @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Match] Name=en* Name=eth* diff --git a/configs/releng/airootfs/etc/systemd/network/20-wireless.network b/configs/releng/airootfs/etc/systemd/network/20-wireless.network index e1d624c..bf9ab9d 100644 --- a/configs/releng/airootfs/etc/systemd/network/20-wireless.network +++ b/configs/releng/airootfs/etc/systemd/network/20-wireless.network @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Match] Name=wlp* Name=wlan* diff --git a/configs/releng/airootfs/etc/systemd/system/choose-mirror.service b/configs/releng/airootfs/etc/systemd/system/choose-mirror.service index b6a3562..b3e4847 100644 --- a/configs/releng/airootfs/etc/systemd/system/choose-mirror.service +++ b/configs/releng/airootfs/etc/systemd/system/choose-mirror.service @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Unit] Description=Choose mirror from the kernel command line ConditionKernelCommandLine=mirror diff --git a/configs/releng/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount b/configs/releng/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount index 4eab551..f86a91d 100644 --- a/configs/releng/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount +++ b/configs/releng/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Unit] Description=Temporary /etc/pacman.d/gnupg directory diff --git a/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf b/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf index d1d8474..370735f 100644 --- a/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf +++ b/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Service] ExecStart= ExecStart=-/sbin/agetty --autologin root --noclear %I 38400 linux diff --git a/configs/releng/airootfs/etc/systemd/system/pacman-init.service b/configs/releng/airootfs/etc/systemd/system/pacman-init.service index 23b8144..3adec4c 100644 --- a/configs/releng/airootfs/etc/systemd/system/pacman-init.service +++ b/configs/releng/airootfs/etc/systemd/system/pacman-init.service @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Unit] Description=Initializes Pacman keyring Wants=haveged.service diff --git a/configs/releng/airootfs/etc/systemd/system/reflector.service b/configs/releng/airootfs/etc/systemd/system/reflector.service index f7a88f2..e15dccf 100644 --- a/configs/releng/airootfs/etc/systemd/system/reflector.service +++ b/configs/releng/airootfs/etc/systemd/system/reflector.service @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Unit] Description=pacman mirrorlist update Wants=network-online.target diff --git a/configs/releng/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf b/configs/releng/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf index c875311..1b4c091 100644 --- a/configs/releng/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf +++ b/configs/releng/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + [Service] ExecStart= ExecStart=/usr/lib/systemd/systemd-networkd-wait-online --any diff --git a/configs/releng/airootfs/root/customize_airootfs.sh b/configs/releng/airootfs/root/customize_airootfs.sh index 3f81617..b121e71 100755 --- a/configs/releng/airootfs/root/customize_airootfs.sh +++ b/configs/releng/airootfs/root/customize_airootfs.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +# +# SPDX-License-Identifier: GPL-3.0-or-later set -e -u diff --git a/configs/releng/airootfs/usr/local/bin/Installation_guide b/configs/releng/airootfs/usr/local/bin/Installation_guide index cd38645..d790c3e 100755 --- a/configs/releng/airootfs/usr/local/bin/Installation_guide +++ b/configs/releng/airootfs/usr/local/bin/Installation_guide @@ -1,3 +1,5 @@ #!/bin/sh +# +# SPDX-License-Identifier: GPL-3.0-or-later exec lynx 'https://wiki.archlinux.org/index.php/Installation_guide' diff --git a/configs/releng/airootfs/usr/local/bin/choose-mirror b/configs/releng/airootfs/usr/local/bin/choose-mirror index 0ae0806..b021945 100755 --- a/configs/releng/airootfs/usr/local/bin/choose-mirror +++ b/configs/releng/airootfs/usr/local/bin/choose-mirror @@ -1,4 +1,6 @@ #!/bin/bash +# +# SPDX-License-Identifier: GPL-3.0-or-later get_cmdline() { local param diff --git a/configs/releng/build.sh b/configs/releng/build.sh index fd28487..e360f23 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +# +# SPDX-License-Identifier: GPL-3.0-or-later set -e -u diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf index b660f1d..52d9536 100644 --- a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf +++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + title Arch Linux install medium (x86_64, UEFI) linux /EFI/archiso/vmlinuz-linux initrd /EFI/archiso/intel-ucode.img diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf index 78c7d23..e1a3908 100644 --- a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf +++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + title Arch Linux install medium (x86_64, UEFI) linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux initrd /%INSTALL_DIR%/boot/intel-ucode.img diff --git a/configs/releng/efiboot/loader/loader.conf b/configs/releng/efiboot/loader/loader.conf index 9a0049c..fd7db27 100644 --- a/configs/releng/efiboot/loader/loader.conf +++ b/configs/releng/efiboot/loader/loader.conf @@ -1,2 +1,5 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + timeout 3 default archiso-x86_64.conf diff --git a/configs/releng/isolinux/isolinux.cfg b/configs/releng/isolinux/isolinux.cfg index 10fd285..7b14d59 100644 --- a/configs/releng/isolinux/isolinux.cfg +++ b/configs/releng/isolinux/isolinux.cfg @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + PATH /%INSTALL_DIR%/boot/syslinux/ DEFAULT loadconfig diff --git a/configs/releng/mkinitcpio.conf b/configs/releng/mkinitcpio.conf index c04f1dc..1b35687 100644 --- a/configs/releng/mkinitcpio.conf +++ b/configs/releng/mkinitcpio.conf @@ -1,2 +1,5 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + HOOKS=(base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block filesystems keyboard) COMPRESSION="xz" diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index 1cfd724..2c73b8e 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -1,3 +1,5 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later amd-ucode arch-install-scripts b43-fwcutter diff --git a/configs/releng/pacman.conf b/configs/releng/pacman.conf index bbca42f..9d895e9 100644 --- a/configs/releng/pacman.conf +++ b/configs/releng/pacman.conf @@ -2,6 +2,8 @@ # /etc/pacman.conf # # See the pacman.conf(5) manpage for option and repository directives +# +# SPDX-License-Identifier: GPL-3.0-or-later # # GENERAL OPTIONS diff --git a/configs/releng/syslinux/archiso.cfg b/configs/releng/syslinux/archiso.cfg index 40d8b34..a6ba8b0 100644 --- a/configs/releng/syslinux/archiso.cfg +++ b/configs/releng/syslinux/archiso.cfg @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + DEFAULT select LABEL select diff --git a/configs/releng/syslinux/archiso_head.cfg b/configs/releng/syslinux/archiso_head.cfg index a915d34..2dc18ed 100644 --- a/configs/releng/syslinux/archiso_head.cfg +++ b/configs/releng/syslinux/archiso_head.cfg @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + SERIAL 0 38400 UI boot/syslinux/vesamenu.c32 MENU TITLE Arch Linux diff --git a/configs/releng/syslinux/archiso_pxe.cfg b/configs/releng/syslinux/archiso_pxe.cfg index 45a8a17..a9c0062 100644 --- a/configs/releng/syslinux/archiso_pxe.cfg +++ b/configs/releng/syslinux/archiso_pxe.cfg @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + INCLUDE boot/syslinux/archiso_head.cfg LABEL arch64_nbd diff --git a/configs/releng/syslinux/archiso_sys.cfg b/configs/releng/syslinux/archiso_sys.cfg index fbf3772..f14d176 100644 --- a/configs/releng/syslinux/archiso_sys.cfg +++ b/configs/releng/syslinux/archiso_sys.cfg @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + INCLUDE boot/syslinux/archiso_head.cfg DEFAULT arch64 diff --git a/configs/releng/syslinux/archiso_tail.cfg b/configs/releng/syslinux/archiso_tail.cfg index 34b6c5b..685e1c8 100644 --- a/configs/releng/syslinux/archiso_tail.cfg +++ b/configs/releng/syslinux/archiso_tail.cfg @@ -1,3 +1,6 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + LABEL existing TEXT HELP Boot an existing operating system. -- cgit v1.2.3-54-g00ecf From a5886ad71ec821a37a96f4bef94002186359792d Mon Sep 17 00:00:00 2001 From: nl6720 Date: Wed, 29 Jul 2020 18:10:25 +0300 Subject: Remove unnecessary files from releng's airootfs configs/releng/airootfs/etc/fstab: /etc/fstab shipped by the filesystem package has only comments. There is no reason to replace it with an empty file. configs/releng/airootfs/etc/systemd/system/default.target: There is no harm in booting to graphical.target. releng does not enable (or even install) any service that has {Required,Wanted}By=graphical.target. --- configs/releng/airootfs/etc/fstab | 2 -- configs/releng/airootfs/etc/systemd/system/default.target | 1 - 2 files changed, 3 deletions(-) delete mode 100644 configs/releng/airootfs/etc/fstab delete mode 120000 configs/releng/airootfs/etc/systemd/system/default.target (limited to 'configs') diff --git a/configs/releng/airootfs/etc/fstab b/configs/releng/airootfs/etc/fstab deleted file mode 100644 index 3988279..0000000 --- a/configs/releng/airootfs/etc/fstab +++ /dev/null @@ -1,2 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later diff --git a/configs/releng/airootfs/etc/systemd/system/default.target b/configs/releng/airootfs/etc/systemd/system/default.target deleted file mode 120000 index d321622..0000000 --- a/configs/releng/airootfs/etc/systemd/system/default.target +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/multi-user.target \ No newline at end of file -- cgit v1.2.3-54-g00ecf From ff0c13f90c4e4ca922171a08f7344e86cd64fcd0 Mon Sep 17 00:00:00 2001 From: nl6720 Date: Wed, 29 Jul 2020 18:18:33 +0300 Subject: Build initramfs images only once Place custom mkinitcpio.conf in airootfs. Use a custom mkinitcpio preset to specify generated image file path. --- configs/baseline/airootfs/etc/mkinitcpio.conf | 69 ++++++++++++++++++++++ .../airootfs/etc/mkinitcpio.d/linux.preset | 11 ++++ configs/baseline/build.sh | 17 ++---- configs/baseline/mkinitcpio.conf | 4 -- configs/releng/airootfs/etc/mkinitcpio.conf | 69 ++++++++++++++++++++++ .../releng/airootfs/etc/mkinitcpio.d/linux.preset | 11 ++++ configs/releng/build.sh | 42 +++++-------- configs/releng/mkinitcpio.conf | 5 -- 8 files changed, 179 insertions(+), 49 deletions(-) create mode 100644 configs/baseline/airootfs/etc/mkinitcpio.conf create mode 100644 configs/baseline/airootfs/etc/mkinitcpio.d/linux.preset delete mode 100644 configs/baseline/mkinitcpio.conf create mode 100644 configs/releng/airootfs/etc/mkinitcpio.conf create mode 100644 configs/releng/airootfs/etc/mkinitcpio.d/linux.preset delete mode 100644 configs/releng/mkinitcpio.conf (limited to 'configs') diff --git a/configs/baseline/airootfs/etc/mkinitcpio.conf b/configs/baseline/airootfs/etc/mkinitcpio.conf new file mode 100644 index 0000000..9741d17 --- /dev/null +++ b/configs/baseline/airootfs/etc/mkinitcpio.conf @@ -0,0 +1,69 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +# vim:set ft=sh +# MODULES +# The following modules are loaded before any boot hooks are +# run. Advanced users may wish to specify all system modules +# in this array. For instance: +# MODULES=(piix ide_disk reiserfs) +MODULES=() + +# BINARIES +# This setting includes any additional binaries a given user may +# wish into the CPIO image. This is run last, so it may be used to +# override the actual binaries included by a given hook +# BINARIES are dependency parsed, so you may safely ignore libraries +BINARIES=() + +# FILES +# This setting is similar to BINARIES above, however, files are added +# as-is and are not parsed in any way. This is useful for config files. +FILES=() + +# HOOKS +# This is the most important setting in this file. The HOOKS control the +# modules and scripts added to the image, and what happens at boot time. +# Order is important, and it is recommended that you do not change the +# order in which HOOKS are added. Run 'mkinitcpio -H ' for +# help on a given hook. +# 'base' is _required_ unless you know precisely what you are doing. +# 'udev' is _required_ in order to automatically load modules +# 'filesystems' is _required_ unless you specify your fs modules in MODULES +# Examples: +## This setup specifies all modules in the MODULES setting above. +## No raid, lvm2, or encrypted root is needed. +# HOOKS=(base) +# +## This setup will autodetect all modules for your system and should +## work as a sane default +# HOOKS=(base udev autodetect block filesystems) +# +## This setup will generate a 'full' image which supports most systems. +## No autodetection is done. +# HOOKS=(base udev block filesystems) +# +## This setup assembles a pata mdadm array with an encrypted root FS. +## Note: See 'mkinitcpio -H mdadm' for more information on raid devices. +# HOOKS=(base udev block mdadm encrypt filesystems) +# +## This setup loads an lvm2 volume group on a usb device. +# HOOKS=(base udev block lvm2 filesystems) +# +## NOTE: If you have /usr on a separate partition, you MUST include the +# usr, fsck and shutdown hooks. +HOOKS=(base udev archiso block filesystems) + +# COMPRESSION +# Use this to compress the initramfs image. By default, gzip compression +# is used. Use 'cat' to create an uncompressed image. +#COMPRESSION="gzip" +#COMPRESSION="bzip2" +#COMPRESSION="lzma" +#COMPRESSION="xz" +#COMPRESSION="lzop" +#COMPRESSION="lz4" + +# COMPRESSION_OPTIONS +# Additional options for the compressor +#COMPRESSION_OPTIONS=() diff --git a/configs/baseline/airootfs/etc/mkinitcpio.d/linux.preset b/configs/baseline/airootfs/etc/mkinitcpio.d/linux.preset new file mode 100644 index 0000000..a1949cd --- /dev/null +++ b/configs/baseline/airootfs/etc/mkinitcpio.d/linux.preset @@ -0,0 +1,11 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +# mkinitcpio preset file for the 'linux' package on archiso + +PRESETS=('archiso') + +ALL_kver='/boot/vmlinuz-linux' +ALL_config='/etc/mkinitcpio.conf' + +archiso_image="/boot/archiso.img" diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh index 92d1249..79cd34e 100755 --- a/configs/baseline/build.sh +++ b/configs/baseline/build.sh @@ -56,6 +56,11 @@ make_custom_airootfs() { done < "${_airootfs}/etc/passwd" fi fi + + mkdir -p -- "${work_dir}/airootfs/etc/initcpio/hooks" + mkdir -p -- "${work_dir}/airootfs/etc/initcpio/install" + cp /usr/lib/initcpio/hooks/archiso "${work_dir}/airootfs/etc/initcpio/hooks/" + cp /usr/lib/initcpio/install/archiso "${work_dir}/airootfs/etc/initcpio/install/" } # Packages (airootfs) @@ -64,17 +69,6 @@ make_packages() { -p "$(grep -h -v '^#' "${script_path}/packages.x86_64"| sed ':a;N;$!ba;s/\n/ /g')" install } -# Copy mkinitcpio archiso hooks and build initramfs (airootfs) -make_setup_mkinitcpio() { - mkdir -p "${work_dir}/airootfs/etc/initcpio/hooks" - mkdir -p "${work_dir}/airootfs/etc/initcpio/install" - cp /usr/lib/initcpio/hooks/archiso "${work_dir}/airootfs/etc/initcpio/hooks" - cp /usr/lib/initcpio/install/archiso "${work_dir}/airootfs/etc/initcpio/install" - cp "${script_path}/mkinitcpio.conf" "${work_dir}/airootfs/etc/mkinitcpio-archiso.conf" - mkarchiso -v -w "${work_dir}" -D "${install_dir}" \ - -r 'mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux -g /boot/archiso.img' run -} - # Prepare ${install_dir}/boot/ make_boot() { mkdir -p "${work_dir}/iso/${install_dir}/boot/${arch}" @@ -118,7 +112,6 @@ make_iso() { run_once make_custom_airootfs run_once make_pacman_conf run_once make_packages -run_once make_setup_mkinitcpio run_once make_boot run_once make_syslinux run_once make_isolinux diff --git a/configs/baseline/mkinitcpio.conf b/configs/baseline/mkinitcpio.conf deleted file mode 100644 index 2f9a39a..0000000 --- a/configs/baseline/mkinitcpio.conf +++ /dev/null @@ -1,4 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -HOOKS=(base udev archiso block filesystems) diff --git a/configs/releng/airootfs/etc/mkinitcpio.conf b/configs/releng/airootfs/etc/mkinitcpio.conf new file mode 100644 index 0000000..3476157 --- /dev/null +++ b/configs/releng/airootfs/etc/mkinitcpio.conf @@ -0,0 +1,69 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +# vim:set ft=sh +# MODULES +# The following modules are loaded before any boot hooks are +# run. Advanced users may wish to specify all system modules +# in this array. For instance: +# MODULES=(piix ide_disk reiserfs) +MODULES=() + +# BINARIES +# This setting includes any additional binaries a given user may +# wish into the CPIO image. This is run last, so it may be used to +# override the actual binaries included by a given hook +# BINARIES are dependency parsed, so you may safely ignore libraries +BINARIES=() + +# FILES +# This setting is similar to BINARIES above, however, files are added +# as-is and are not parsed in any way. This is useful for config files. +FILES=() + +# HOOKS +# This is the most important setting in this file. The HOOKS control the +# modules and scripts added to the image, and what happens at boot time. +# Order is important, and it is recommended that you do not change the +# order in which HOOKS are added. Run 'mkinitcpio -H ' for +# help on a given hook. +# 'base' is _required_ unless you know precisely what you are doing. +# 'udev' is _required_ in order to automatically load modules +# 'filesystems' is _required_ unless you specify your fs modules in MODULES +# Examples: +## This setup specifies all modules in the MODULES setting above. +## No raid, lvm2, or encrypted root is needed. +# HOOKS=(base) +# +## This setup will autodetect all modules for your system and should +## work as a sane default +# HOOKS=(base udev autodetect block filesystems) +# +## This setup will generate a 'full' image which supports most systems. +## No autodetection is done. +# HOOKS=(base udev block filesystems) +# +## This setup assembles a pata mdadm array with an encrypted root FS. +## Note: See 'mkinitcpio -H mdadm' for more information on raid devices. +# HOOKS=(base udev block mdadm encrypt filesystems) +# +## This setup loads an lvm2 volume group on a usb device. +# HOOKS=(base udev block lvm2 filesystems) +# +## NOTE: If you have /usr on a separate partition, you MUST include the +# usr, fsck and shutdown hooks. +HOOKS=(base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block filesystems keyboard) + +# COMPRESSION +# Use this to compress the initramfs image. By default, gzip compression +# is used. Use 'cat' to create an uncompressed image. +#COMPRESSION="gzip" +#COMPRESSION="bzip2" +#COMPRESSION="lzma" +COMPRESSION="xz" +#COMPRESSION="lzop" +#COMPRESSION="lz4" + +# COMPRESSION_OPTIONS +# Additional options for the compressor +#COMPRESSION_OPTIONS=() diff --git a/configs/releng/airootfs/etc/mkinitcpio.d/linux.preset b/configs/releng/airootfs/etc/mkinitcpio.d/linux.preset new file mode 100644 index 0000000..a1949cd --- /dev/null +++ b/configs/releng/airootfs/etc/mkinitcpio.d/linux.preset @@ -0,0 +1,11 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +# mkinitcpio preset file for the 'linux' package on archiso + +PRESETS=('archiso') + +ALL_kver='/boot/vmlinuz-linux' +ALL_config='/etc/mkinitcpio.conf' + +archiso_image="/boot/archiso.img" diff --git a/configs/releng/build.sh b/configs/releng/build.sh index e360f23..888c061 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -86,44 +86,31 @@ make_custom_airootfs() { done < "${_airootfs}/etc/passwd" fi fi -} - -# Packages (airootfs) -make_packages() { - if [ -n "${verbose}" ]; then - mkarchiso -v -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \ - -p "$(grep -h -v '^#' "${script_path}/packages.x86_64"| sed ':a;N;$!ba;s/\n/ /g')" install - else - mkarchiso -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \ - -p "$(grep -h -v '^#' "${script_path}/packages.x86_64"| sed ':a;N;$!ba;s/\n/ /g')" install - fi -} -# Copy mkinitcpio archiso hooks and build initramfs (airootfs) -make_setup_mkinitcpio() { local _hook - mkdir -p "${work_dir}/x86_64/airootfs/etc/initcpio/hooks" - mkdir -p "${work_dir}/x86_64/airootfs/etc/initcpio/install" + mkdir -p -- "${work_dir}/x86_64/airootfs/etc/initcpio/hooks" + mkdir -p -- "${work_dir}/x86_64/airootfs/etc/initcpio/install" for _hook in archiso archiso_shutdown archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_loop_mnt; do - cp "/usr/lib/initcpio/hooks/${_hook}" "${work_dir}/x86_64/airootfs/etc/initcpio/hooks" - cp "/usr/lib/initcpio/install/${_hook}" "${work_dir}/x86_64/airootfs/etc/initcpio/install" + cp "/usr/lib/initcpio/hooks/${_hook}" "${work_dir}/x86_64/airootfs/etc/initcpio/hooks/" + cp "/usr/lib/initcpio/install/${_hook}" "${work_dir}/x86_64/airootfs/etc/initcpio/install/" done sed -i "s|/usr/lib/initcpio/|/etc/initcpio/|g" "${work_dir}/x86_64/airootfs/etc/initcpio/install/archiso_shutdown" - cp /usr/lib/initcpio/install/archiso_kms "${work_dir}/x86_64/airootfs/etc/initcpio/install" - cp /usr/lib/initcpio/archiso_shutdown "${work_dir}/x86_64/airootfs/etc/initcpio" - cp "${script_path}/mkinitcpio.conf" "${work_dir}/x86_64/airootfs/etc/mkinitcpio-archiso.conf" + cp /usr/lib/initcpio/install/archiso_kms "${work_dir}/x86_64/airootfs/etc/initcpio/install/" + cp /usr/lib/initcpio/archiso_shutdown "${work_dir}/x86_64/airootfs/etc/initcpio/" +} + +# Packages (airootfs) +make_packages() { if [[ "${gpg_key}" ]]; then gpg --export "${gpg_key}" > "${work_dir}/gpgkey" exec 17<>"${work_dir}/gpgkey" fi if [ -n "${verbose}" ]; then - ARCHISO_GNUPG_FD="${gpg_key:+17}" mkarchiso -v -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" \ - -D "${install_dir}" \ - -r 'mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux -g /boot/archiso.img' run + ARCHISO_GNUPG_FD="${gpg_key:+17}" mkarchiso -v -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \ + -p "$(grep -h -v '^#' "${script_path}/packages.x86_64"| sed ':a;N;$!ba;s/\n/ /g')" install else - ARCHISO_GNUPG_FD="${gpg_key:+17}" mkarchiso -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" \ - -D "${install_dir}" \ - -r 'mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux -g /boot/archiso.img' run + ARCHISO_GNUPG_FD="${gpg_key:+17}" mkarchiso -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \ + -p "$(grep -h -v '^#' "${script_path}/packages.x86_64"| sed ':a;N;$!ba;s/\n/ /g')" install fi if [[ "${gpg_key}" ]]; then exec 17<&- @@ -321,7 +308,6 @@ run_once make_pacman_conf run_once make_custom_airootfs run_once make_packages run_once make_customize_airootfs -run_once make_setup_mkinitcpio run_once make_boot run_once make_boot_extra run_once make_syslinux diff --git a/configs/releng/mkinitcpio.conf b/configs/releng/mkinitcpio.conf deleted file mode 100644 index 1b35687..0000000 --- a/configs/releng/mkinitcpio.conf +++ /dev/null @@ -1,5 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - -HOOKS=(base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block filesystems keyboard) -COMPRESSION="xz" -- cgit v1.2.3-54-g00ecf From b5f04dba2b45d4949cad0666d0df84637e10960f Mon Sep 17 00:00:00 2001 From: nl6720 Date: Wed, 29 Jul 2020 19:23:58 +0300 Subject: Install mkinitcpio-archiso-hooks in airootfs instead of copying the hooks from host --- README.rst | 6 ++++++ configs/baseline/build.sh | 5 ----- configs/baseline/packages.x86_64 | 1 + configs/releng/build.sh | 11 ----------- configs/releng/packages.x86_64 | 1 + 5 files changed, 8 insertions(+), 16 deletions(-) (limited to 'configs') diff --git a/README.rst b/README.rst index 7ad0d41..af54aba 100644 --- a/README.rst +++ b/README.rst @@ -112,6 +112,12 @@ To install archiso system-wide use the included **Makefile**: make install +Optionally install archiso's mkinitcpio hooks: + + .. code:: bash + + make install-initcpio + License ======= diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh index 79cd34e..c0b1704 100755 --- a/configs/baseline/build.sh +++ b/configs/baseline/build.sh @@ -56,11 +56,6 @@ make_custom_airootfs() { done < "${_airootfs}/etc/passwd" fi fi - - mkdir -p -- "${work_dir}/airootfs/etc/initcpio/hooks" - mkdir -p -- "${work_dir}/airootfs/etc/initcpio/install" - cp /usr/lib/initcpio/hooks/archiso "${work_dir}/airootfs/etc/initcpio/hooks/" - cp /usr/lib/initcpio/install/archiso "${work_dir}/airootfs/etc/initcpio/install/" } # Packages (airootfs) diff --git a/configs/baseline/packages.x86_64 b/configs/baseline/packages.x86_64 index 14fe5f0..fd753b4 100644 --- a/configs/baseline/packages.x86_64 +++ b/configs/baseline/packages.x86_64 @@ -3,4 +3,5 @@ base linux mkinitcpio +mkinitcpio-archiso syslinux diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 888c061..7f0eb67 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -86,17 +86,6 @@ make_custom_airootfs() { done < "${_airootfs}/etc/passwd" fi fi - - local _hook - mkdir -p -- "${work_dir}/x86_64/airootfs/etc/initcpio/hooks" - mkdir -p -- "${work_dir}/x86_64/airootfs/etc/initcpio/install" - for _hook in archiso archiso_shutdown archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_loop_mnt; do - cp "/usr/lib/initcpio/hooks/${_hook}" "${work_dir}/x86_64/airootfs/etc/initcpio/hooks/" - cp "/usr/lib/initcpio/install/${_hook}" "${work_dir}/x86_64/airootfs/etc/initcpio/install/" - done - sed -i "s|/usr/lib/initcpio/|/etc/initcpio/|g" "${work_dir}/x86_64/airootfs/etc/initcpio/install/archiso_shutdown" - cp /usr/lib/initcpio/install/archiso_kms "${work_dir}/x86_64/airootfs/etc/initcpio/install/" - cp /usr/lib/initcpio/archiso_shutdown "${work_dir}/x86_64/airootfs/etc/initcpio/" } # Packages (airootfs) diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index 2c73b8e..f5e7e9f 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -48,6 +48,7 @@ mc mdadm memtest86+ mkinitcpio +mkinitcpio-archiso mkinitcpio-nfs-utils mtools nano -- cgit v1.2.3-54-g00ecf From a96330699f6a45de80138a84e7029fd56fbcc78d Mon Sep 17 00:00:00 2001 From: David Runge Date: Thu, 30 Jul 2020 10:39:07 +0200 Subject: Use latest synced mirrors instead of age configs/releng/airootfs/etc/systemd/system/reflector.service: Use the 70 mirrors synced most recently (--latest) instead of a specific time since last sync (--age). According to FS#67399 using 1hour as sync age is too short, as it sometimes leads to empty list. --- configs/releng/airootfs/etc/systemd/system/reflector.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configs') diff --git a/configs/releng/airootfs/etc/systemd/system/reflector.service b/configs/releng/airootfs/etc/systemd/system/reflector.service index e15dccf..4058e36 100644 --- a/configs/releng/airootfs/etc/systemd/system/reflector.service +++ b/configs/releng/airootfs/etc/systemd/system/reflector.service @@ -9,7 +9,7 @@ ConditionKernelCommandLine=!mirror [Service] Type=oneshot -ExecStart=/usr/bin/reflector --protocol https --age 1 --sort rate --save /etc/pacman.d/mirrorlist +ExecStart=/usr/bin/reflector --protocol https --latest 70 --sort rate --save /etc/pacman.d/mirrorlist Restart=on-failure RestartSec=10 CacheDirectory=reflector -- cgit v1.2.3-54-g00ecf From 0ada52d47f4bb98e8843663e8e2fa05dd52f58f4 Mon Sep 17 00:00:00 2001 From: nl6720 Date: Thu, 30 Jul 2020 14:27:41 +0300 Subject: releng: place custom sshd_config in airootfs Properly track the file instead of modifying it on-the-fly with customize_airootfs.sh. See https://gitlab.archlinux.org/archlinux/archiso/-/issues/21 . --- configs/releng/airootfs/etc/ssh/sshd_config | 116 +++++++++++++++++++++ configs/releng/airootfs/root/customize_airootfs.sh | 1 - 2 files changed, 116 insertions(+), 1 deletion(-) create mode 100644 configs/releng/airootfs/etc/ssh/sshd_config (limited to 'configs') diff --git a/configs/releng/airootfs/etc/ssh/sshd_config b/configs/releng/airootfs/etc/ssh/sshd_config new file mode 100644 index 0000000..8ef1758 --- /dev/null +++ b/configs/releng/airootfs/etc/ssh/sshd_config @@ -0,0 +1,116 @@ +# $OpenBSD: sshd_config,v 1.103 2018/04/09 20:41:22 tj Exp $ + +# This is the sshd server system-wide configuration file. See +# sshd_config(5) for more information. + +# This sshd was compiled with PATH=/usr/local/sbin:/usr/local/bin:/usr/bin + +# The strategy used for options in the default sshd_config shipped with +# OpenSSH is to specify options with their default value where +# possible, but leave them commented. Uncommented options override the +# default value. + +#Port 22 +#AddressFamily any +#ListenAddress 0.0.0.0 +#ListenAddress :: + +#HostKey /etc/ssh/ssh_host_rsa_key +#HostKey /etc/ssh/ssh_host_ecdsa_key +#HostKey /etc/ssh/ssh_host_ed25519_key + +# Ciphers and keying +#RekeyLimit default none + +# Logging +#SyslogFacility AUTH +#LogLevel INFO + +# Authentication: + +#LoginGraceTime 2m +PermitRootLogin yes +#StrictModes yes +#MaxAuthTries 6 +#MaxSessions 10 + +#PubkeyAuthentication yes + +# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 +# but this is overridden so installations will only check .ssh/authorized_keys +AuthorizedKeysFile .ssh/authorized_keys + +#AuthorizedPrincipalsFile none + +#AuthorizedKeysCommand none +#AuthorizedKeysCommandUser nobody + +# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts +#HostbasedAuthentication no +# Change to yes if you don't trust ~/.ssh/known_hosts for +# HostbasedAuthentication +#IgnoreUserKnownHosts no +# Don't read the user's ~/.rhosts and ~/.shosts files +#IgnoreRhosts yes + +# To disable tunneled clear text passwords, change to no here! +#PasswordAuthentication yes +#PermitEmptyPasswords no + +# Change to no to disable s/key passwords +ChallengeResponseAuthentication no + +# Kerberos options +#KerberosAuthentication no +#KerberosOrLocalPasswd yes +#KerberosTicketCleanup yes +#KerberosGetAFSToken no + +# GSSAPI options +#GSSAPIAuthentication no +#GSSAPICleanupCredentials yes + +# Set this to 'yes' to enable PAM authentication, account processing, +# and session processing. If this is enabled, PAM authentication will +# be allowed through the ChallengeResponseAuthentication and +# PasswordAuthentication. Depending on your PAM configuration, +# PAM authentication via ChallengeResponseAuthentication may bypass +# the setting of "PermitRootLogin without-password". +# If you just want the PAM account and session checks to run without +# PAM authentication, then enable this but set PasswordAuthentication +# and ChallengeResponseAuthentication to 'no'. +UsePAM yes + +#AllowAgentForwarding yes +#AllowTcpForwarding yes +#GatewayPorts no +#X11Forwarding no +#X11DisplayOffset 10 +#X11UseLocalhost yes +#PermitTTY yes +PrintMotd no # pam does that +#PrintLastLog yes +#TCPKeepAlive yes +#PermitUserEnvironment no +#Compression delayed +#ClientAliveInterval 0 +#ClientAliveCountMax 3 +#UseDNS no +#PidFile /run/sshd.pid +#MaxStartups 10:30:100 +#PermitTunnel no +#ChrootDirectory none +#VersionAddendum none + +# no default banner path +#Banner none + +# override default of no subsystems +Subsystem sftp /usr/lib/ssh/sftp-server + +# Example of overriding settings on a per-user basis +#Match User anoncvs +# X11Forwarding no +# AllowTcpForwarding no +# PermitTTY no +# ForceCommand cvs server diff --git a/configs/releng/airootfs/root/customize_airootfs.sh b/configs/releng/airootfs/root/customize_airootfs.sh index b121e71..cf3fe19 100755 --- a/configs/releng/airootfs/root/customize_airootfs.sh +++ b/configs/releng/airootfs/root/customize_airootfs.sh @@ -9,5 +9,4 @@ echo 'Warning: customize_airootfs.sh is deprecated! Support for it will be remov sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen locale-gen -sed -i 's/#\(PermitRootLogin \).\+/\1yes/' /etc/ssh/sshd_config sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist -- cgit v1.2.3-54-g00ecf From d52d36363e738d562f6dee90616504ec9541e9cd Mon Sep 17 00:00:00 2001 From: nl6720 Date: Thu, 30 Jul 2020 18:22:44 +0300 Subject: releng: copy UEFI shell from airootfs instead of the host system Fixes https://gitlab.archlinux.org/archlinux/archiso/-/issues/35 . --- README.rst | 1 - configs/releng/build.sh | 2 +- configs/releng/packages.x86_64 | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) (limited to 'configs') diff --git a/README.rst b/README.rst index af54aba..b65db6d 100644 --- a/README.rst +++ b/README.rst @@ -14,7 +14,6 @@ The following packages need to be installed to be able to create an image with t * arch-install-scripts * dosfstools * e2fsprogs -* edk2-shell * libisoburn * squashfs-tools diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 7f0eb67..709bd46 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -204,7 +204,7 @@ make_efi() { # edk2-shell based UEFI shell # shellx64.efi is picked up automatically when on / - cp /usr/share/edk2-shell/x64/Shell_Full.efi "${work_dir}/iso/shellx64.efi" + cp "${work_dir}/x86_64/airootfs/usr/share/edk2-shell/x64/Shell_Full.efi" "${work_dir}/iso/shellx64.efi" } # Prepare efiboot.img::/EFI for "El Torito" EFI boot mode diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index f5e7e9f..47dc64c 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -17,6 +17,7 @@ diffutils dmraid dnsmasq dosfstools +edk2-shell efibootmgr ethtool exfat-utils -- cgit v1.2.3-54-g00ecf From e467c69e943ff1f25f7495344a3dac89a4266049 Mon Sep 17 00:00:00 2001 From: nl6720 Date: Sun, 2 Aug 2020 15:57:29 +0300 Subject: configs/releng/syslinux/archiso_pxe.cfg: add "checksum" and "verify" boot options An ISO's checksum and GPG validation primarily matters when PXE booting, so it would be appropriate to enable these options for releng. They should protect against booting a corrupt image. --- configs/releng/syslinux/archiso_pxe.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configs') diff --git a/configs/releng/syslinux/archiso_pxe.cfg b/configs/releng/syslinux/archiso_pxe.cfg index a9c0062..ed15c7d 100644 --- a/configs/releng/syslinux/archiso_pxe.cfg +++ b/configs/releng/syslinux/archiso_pxe.cfg @@ -11,7 +11,7 @@ ENDTEXT MENU LABEL Arch Linux install medium (x86_64, NBD) LINUX boot/x86_64/vmlinuz-linux 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} +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} checksum verify SYSAPPEND 3 LABEL arch64_nfs @@ -22,7 +22,7 @@ ENDTEXT MENU LABEL Arch Linux install medium (x86_64, NFS) LINUX boot/x86_64/vmlinuz-linux 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 +APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt checksum verify SYSAPPEND 3 LABEL arch64_http @@ -33,7 +33,7 @@ ENDTEXT MENU LABEL Arch Linux install medium (x86_64, HTTP) LINUX boot/x86_64/vmlinuz-linux INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ +APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ checksum verify SYSAPPEND 3 INCLUDE boot/syslinux/archiso_tail.cfg -- cgit v1.2.3-54-g00ecf From 951b2178131ff64c01c35529f718773a9fa058bb Mon Sep 17 00:00:00 2001 From: nl6720 Date: Tue, 4 Aug 2020 14:51:50 +0300 Subject: configs/releng/packages.x86_64: replace exfat-utils with exfatprogs exfatprogs uses the kernel's driver unlike exfat-utils which provides a FUSE driver. --- configs/releng/packages.x86_64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configs') diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index 47dc64c..931f2ef 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -20,7 +20,7 @@ dosfstools edk2-shell efibootmgr ethtool -exfat-utils +exfatprogs f2fs-tools fsarchiver gnu-netcat -- cgit v1.2.3-54-g00ecf From 1cc7375c2576fe2cce6352e7e9c860a4b222d0ab Mon Sep 17 00:00:00 2001 From: nl6720 Date: Fri, 14 Aug 2020 07:52:59 +0300 Subject: archiso/mkarchiso: start preparing a build_profile command Nothing is implemented yet! configs/releng/profiledef.sh: A test profile. --- Makefile | 1 + archiso/mkarchiso | 122 +++++++++++++++++++++++++++---------------- configs/releng/profiledef.sh | 12 +++++ 3 files changed, 91 insertions(+), 44 deletions(-) create mode 100644 configs/releng/profiledef.sh (limited to 'configs') diff --git a/Makefile b/Makefile index 573d044..2890026 100644 --- a/Makefile +++ b/Makefile @@ -23,6 +23,7 @@ lint: scripts/run_archiso.sh \ $(INSTALL_FILES) \ $(wildcard configs/*/build.sh) \ + $(wildcard configs/*/profiledef.sh) \ configs/releng/airootfs/root/.automated_script.sh \ configs/releng/airootfs/usr/local/bin/choose-mirror shellcheck -s dash $(HOOKS_FILES) $(SCRIPT_FILES) diff --git a/archiso/mkarchiso b/archiso/mkarchiso index 1dca307..626fb6d 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -9,22 +9,31 @@ umask 0022 export LANG="C" export SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-"$(date +%s)"}" +# mkarchiso defaults app_name="${0##*/}" -arch="$(uname -m)" pkg_list=() run_cmd="" quiet="y" -pacman_conf="/etc/pacman.conf" -iso_label="ARCH_$(date +%Y%m)" -iso_publisher="Arch Linux " -iso_application="Arch Linux Live/Rescue CD" -install_dir="arch" work_dir="work" out_dir="out" +img_name="${app_name}.iso" sfs_mode="sfs" sfs_comp="xz" gpg_key="" +# profile defaults +profile="" +iso_name="${app_name}" +iso_label="${app_name^^}" +iso_publisher="${app_name}" +iso_application="${app_name} iso" +iso_version="" +install_dir="${app_name}" +arch="$(uname -m)" +pacman_conf="/etc/pacman.conf" +bootmodes=() + + # Show an INFO message # $1: message string _msg_info() { @@ -33,6 +42,13 @@ _msg_info() { } +# Show a WARNING message +# $1: message string +_msg_warning() { + local _msg="${1}" + printf '\n[%s] WARNING: %s\n\n' "${app_name}" "${_msg}" >&2 +} + # Show an ERROR message then exit with status # $1: message string # $2: exit code number (with 0 does not exit) @@ -46,19 +62,19 @@ _msg_error() { } _chroot_init() { - mkdir -p -- "${work_dir}/airootfs" + mkdir -p -- "${airootfs_dir}" _pacman base syslinux } _chroot_run() { - eval -- arch-chroot "${work_dir}/airootfs" "${run_cmd}" + eval -- arch-chroot "${airootfs_dir}" "${run_cmd}" } _mount_airootfs() { trap "_umount_airootfs" EXIT HUP INT TERM mkdir -p -- "${work_dir}/mnt/airootfs" - _msg_info "Mounting '${work_dir}/airootfs.img' on '${work_dir}/mnt/airootfs'" - mount -- "${work_dir}/airootfs.img" "${work_dir}/mnt/airootfs" + _msg_info "Mounting '${airootfs_dir}.img' on '${work_dir}/mnt/airootfs'" + mount -- "${airootfs_dir}.img" "${work_dir}/mnt/airootfs" _msg_info "Done!" } @@ -156,12 +172,12 @@ _show_config () { # Install desired packages to airootfs _pacman () { - _msg_info "Installing packages to '${work_dir}/airootfs/'..." + _msg_info "Installing packages to '${airootfs_dir}/'..." if [[ "${quiet}" = "y" ]]; then - pacstrap -C "${pacman_conf}" -c -G -M -- "${work_dir}/airootfs" "$@" &> /dev/null + pacstrap -C "${pacman_conf}" -c -G -M -- "${airootfs_dir}" "$@" &> /dev/null else - pacstrap -C "${pacman_conf}" -c -G -M -- "${work_dir}/airootfs" "$@" + pacstrap -C "${pacman_conf}" -c -G -M -- "${airootfs_dir}" "$@" fi _msg_info "Packages installed successfully!" @@ -172,32 +188,32 @@ _cleanup () { _msg_info "Cleaning up what we can on airootfs..." # Delete initcpio image(s) - if [[ -d "${work_dir}/airootfs/boot" ]]; then - find "${work_dir}/airootfs/boot" -type f -name '*.img' -delete + if [[ -d "${airootfs_dir}/boot" ]]; then + find "${airootfs_dir}/boot" -type f -name '*.img' -delete fi # Delete kernel(s) - if [[ -d "${work_dir}/airootfs/boot" ]]; then - find "${work_dir}/airootfs/boot" -type f -name 'vmlinuz*' -delete + if [[ -d "${airootfs_dir}/boot" ]]; then + find "${airootfs_dir}/boot" -type f -name 'vmlinuz*' -delete fi # Delete pacman database sync cache files (*.tar.gz) - if [[ -d "${work_dir}/airootfs/var/lib/pacman" ]]; then - find "${work_dir}/airootfs/var/lib/pacman" -maxdepth 1 -type f -delete + if [[ -d "${airootfs_dir}/var/lib/pacman" ]]; then + find "${airootfs_dir}/var/lib/pacman" -maxdepth 1 -type f -delete fi # Delete pacman database sync cache - if [[ -d "${work_dir}/airootfs/var/lib/pacman/sync" ]]; then - find "${work_dir}/airootfs/var/lib/pacman/sync" -delete + if [[ -d "${airootfs_dir}/var/lib/pacman/sync" ]]; then + find "${airootfs_dir}/var/lib/pacman/sync" -delete fi # Delete pacman package cache - if [[ -d "${work_dir}/airootfs/var/cache/pacman/pkg" ]]; then - find "${work_dir}/airootfs/var/cache/pacman/pkg" -type f -delete + if [[ -d "${airootfs_dir}/var/cache/pacman/pkg" ]]; then + find "${airootfs_dir}/var/cache/pacman/pkg" -type f -delete fi # Delete all log files, keeps empty dirs. - if [[ -d "${work_dir}/airootfs/var/log" ]]; then - find "${work_dir}/airootfs/var/log" -type f -delete + if [[ -d "${airootfs_dir}/var/log" ]]; then + find "${airootfs_dir}/var/log" -type f -delete fi # Delete all temporary files and dirs - if [[ -d "${work_dir}/airootfs/var/tmp" ]]; then - find "${work_dir}/airootfs/var/tmp" -mindepth 1 -delete + if [[ -d "${airootfs_dir}/var/tmp" ]]; then + find "${airootfs_dir}/var/tmp" -mindepth 1 -delete fi # Delete package pacman related files. find "${work_dir}" \( -name '*.pacnew' -o -name '*.pacsave' -o -name '*.pacorig' \) -delete @@ -206,51 +222,51 @@ _cleanup () { # Makes a ext4 filesystem inside a SquashFS from a source directory. _mkairootfs_img () { - if [[ ! -e "${work_dir}/airootfs" ]]; then - _msg_error "The path '${work_dir}/airootfs' does not exist" 1 + if [[ ! -e "${airootfs_dir}" ]]; then + _msg_error "The path '${airootfs_dir}' does not exist" 1 fi _msg_info "Creating ext4 image of 32GiB..." - truncate -s 32G -- "${work_dir}/airootfs.img" + truncate -s 32G -- "${airootfs_dir}.img" if [[ "${quiet}" == "y" ]]; then - mkfs.ext4 -q -O '^has_journal,^resize_inode' -E 'lazy_itable_init=0' -m 0 -F -- "${work_dir}/airootfs.img" + mkfs.ext4 -q -O '^has_journal,^resize_inode' -E 'lazy_itable_init=0' -m 0 -F -- "${airootfs_dir}.img" else - mkfs.ext4 -O '^has_journal,^resize_inode' -E 'lazy_itable_init=0' -m 0 -F -- "${work_dir}/airootfs.img" + mkfs.ext4 -O '^has_journal,^resize_inode' -E 'lazy_itable_init=0' -m 0 -F -- "${airootfs_dir}.img" fi - tune2fs -c 0 -i 0 -- "${work_dir}/airootfs.img" &> /dev/null + tune2fs -c 0 -i 0 -- "${airootfs_dir}.img" &> /dev/null _msg_info "Done!" _mount_airootfs - _msg_info "Copying '${work_dir}/airootfs/' to '${work_dir}/mnt/airootfs/'..." - cp -aT -- "${work_dir}/airootfs/" "${work_dir}/mnt/airootfs/" + _msg_info "Copying '${airootfs_dir}/' to '${work_dir}/mnt/airootfs/'..." + cp -aT -- "${airootfs_dir}/" "${work_dir}/mnt/airootfs/" chown root:root -- "${work_dir}/mnt/airootfs/" _msg_info "Done!" _umount_airootfs mkdir -p -- "${work_dir}/iso/${install_dir}/${arch}" _msg_info "Creating SquashFS image, this may take some time..." if [[ "${quiet}" = "y" ]]; then - mksquashfs "${work_dir}/airootfs.img" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \ + mksquashfs "${airootfs_dir}.img" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \ -comp "${sfs_comp}" -no-progress &> /dev/null else - mksquashfs "${work_dir}/airootfs.img" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \ + mksquashfs "${airootfs_dir}.img" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \ -comp "${sfs_comp}" fi _msg_info "Done!" - rm -- "${work_dir}/airootfs.img" + rm -- "${airootfs_dir}.img" } # Makes a SquashFS filesystem from a source directory. _mkairootfs_sfs () { - if [[ ! -e "${work_dir}/airootfs" ]]; then - _msg_error "The path '${work_dir}/airootfs' does not exist" 1 + if [[ ! -e "${airootfs_dir}" ]]; then + _msg_error "The path '${airootfs_dir}' does not exist" 1 fi mkdir -p -- "${work_dir}/iso/${install_dir}/${arch}" _msg_info "Creating SquashFS image, this may take some time..." if [[ "${quiet}" = "y" ]]; then - mksquashfs "${work_dir}/airootfs" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \ + mksquashfs "${airootfs_dir}" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \ -comp "${sfs_comp}" -no-progress &> /dev/null else - mksquashfs "${work_dir}/airootfs" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \ + mksquashfs "${airootfs_dir}" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \ -comp "${sfs_comp}" fi _msg_info "Done!" @@ -272,11 +288,12 @@ _mksignature () { _msg_info "Done!" } + command_pkglist () { _show_config pkglist _msg_info "Creating a list of installed packages on live-enviroment..." - pacman -Q --sysroot "${work_dir}/airootfs" > "${work_dir}/iso/${install_dir}/pkglist.${arch}.txt" + pacman -Q --sysroot "${airootfs_dir}" > "${work_dir}/iso/${install_dir}/pkglist.${arch}.txt" _msg_info "Done!" } @@ -386,8 +403,19 @@ command_run() { _chroot_run } -while getopts 'p:r:C:L:P:A:D:w:o:s:c:g:vh' arg; do +command_build_profile() { + _msg_warning "The ${FUNCNAME[0]#command_} command is not fully implemented yet :(" + # Set up essential directory paths + airootfs_dir="${work_dir}/${arch}/airootfs" + + exit 1 +} + +while getopts 'B:p:r:C:L:P:A:D:w:o:s:c:g:vh' arg; do case "${arg}" in + B) + profile="$(realpath -- "${OPTARG}")" + ;; p) read -r -a opt_pkg_list <<< "${OPTARG}" pkg_list+=("${opt_pkg_list[@]}") @@ -424,6 +452,9 @@ if (( $# < 1 )); then fi command_name="${1}" +# Set directory path defaults +airootfs_dir="${work_dir}/airootfs" + case "${command_name}" in init) command_init @@ -448,6 +479,9 @@ case "${command_name}" in img_name="${2}" command_iso ;; + build_profile) + command_build_profile + ;; *) _msg_error "Invalid command name '${command_name}'" 0 _usage 1 diff --git a/configs/releng/profiledef.sh b/configs/releng/profiledef.sh new file mode 100644 index 0000000..5eb5c5a --- /dev/null +++ b/configs/releng/profiledef.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +# shellcheck disable=SC2034 + +iso_name="archlinux" +iso_label="ARCH_$(date +%Y%m)" +iso_publisher="Arch Linux " +iso_application="Arch Linux Live/Rescue CD" +iso_version="$(date +%Y.%m.%d)" +install_dir="arch" +bootmodes=() +arch="x86_64" +pacman_conf="pacman.conf" -- cgit v1.2.3-54-g00ecf From 7c2247f615ecdff8d236ac90c4bec1c3d255a497 Mon Sep 17 00:00:00 2001 From: nl6720 Date: Wed, 12 Aug 2020 19:42:02 +0300 Subject: archiso/mkarchiso: allow choosing boot modes from profiledef.sh Boot mode names are: - bios_syslinux.mbr: SYSLINUX in MBR - bios.syslinux.eltorito: SYSLINUX (ISOLINUX) via El Torito - uefi-x64.systemd-boot.esp: systemd-boot on ESP in MBR - uefi-x64.systemd-boot.eltorito: systemd-boot on ESP via El Torito It is not yet possible to create an ISO with only El Torito or only MBR boot modes! --- archiso/mkarchiso | 213 ++++++++++++++++++++++++----------------- configs/baseline/profiledef.sh | 12 +++ configs/releng/profiledef.sh | 2 +- 3 files changed, 136 insertions(+), 91 deletions(-) create mode 100644 configs/baseline/profiledef.sh (limited to 'configs') diff --git a/archiso/mkarchiso b/archiso/mkarchiso index 5769d14..c2b6f24 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -368,22 +368,23 @@ _make_customize_airootfs() { fi } +# Set up boot loaders +_make_bootmodes() { + local bootmode + for bootmode in "${bootmodes[@]}"; do + if typeset -f "_make_boot_${bootmode}" &> /dev/null; then + _run_once "_make_boot_${bootmode}" + else + _msg_error "${bootmode} is not a valid boot mode" 1 + fi + done +} + # Prepare kernel/initramfs ${install_dir}/boot/ -_make_boot() { +_make_boot_on_iso() { mkdir -p -- "${isofs_dir}/${install_dir}/boot/${arch}" install -m 0644 -- "${airootfs_dir}/boot/archiso.img" "${isofs_dir}/${install_dir}/boot/${arch}/" install -m 0644 -- "${airootfs_dir}/boot/vmlinuz-linux" "${isofs_dir}/${install_dir}/boot/${arch}/" -} - -# Add other aditional/extra files to ${install_dir}/boot/ -_make_boot_extra() { - if [[ -e "${airootfs_dir}/boot/memtest86+/memtest.bin" ]]; then - # rename for PXE: https://wiki.archlinux.org/index.php/Syslinux#Using_memtest - install -m 0644 -- "${airootfs_dir}/boot/memtest86+/memtest.bin" "${isofs_dir}/${install_dir}/boot/memtest" - mkdir -p "${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 if [[ -e "${airootfs_dir}/boot/intel-ucode.img" ]]; then install -m 0644 -- "${airootfs_dir}/boot/intel-ucode.img" "${isofs_dir}/${install_dir}/boot/" mkdir -p "${isofs_dir}/${install_dir}/boot/licenses/intel-ucode/" @@ -399,32 +400,53 @@ _make_boot_extra() { } # Prepare /${install_dir}/boot/syslinux -_make_syslinux() { - _uname_r=$(file -b "${airootfs_dir}/boot/vmlinuz-linux"| awk 'f{print;f=0} /version/{f=1}' RS=' ') +_make_boot_bios.syslinux.mbr() { mkdir -p "${isofs_dir}/${install_dir}/boot/syslinux" for _cfg in "${profile}/syslinux/"*.cfg; do sed "s|%ARCHISO_LABEL%|${iso_label}|g; - s|%INSTALL_DIR%|${install_dir}|g" "${_cfg}" > "${isofs_dir}/${install_dir}/boot/syslinux/${_cfg##*/}" + s|%INSTALL_DIR%|${install_dir}|g; + s|%ARCH%|${arch}|g" \ + "${_cfg}" > "${isofs_dir}/${install_dir}/boot/syslinux/${_cfg##*/}" done - install -m 0644 -- "${profile}/syslinux/splash.png" "${isofs_dir}/${install_dir}/boot/syslinux/" + if [[ -e "${profile}/syslinux/splash.png" ]]; then + install -m 0644 -- "${profile}/syslinux/splash.png" "${isofs_dir}/${install_dir}/boot/syslinux/" + fi install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/"*.c32 "${isofs_dir}/${install_dir}/boot/syslinux/" install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/lpxelinux.0" "${isofs_dir}/${install_dir}/boot/syslinux/" install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/memdisk" "${isofs_dir}/${install_dir}/boot/syslinux/" + + _make_boot_on_iso + _uname_r=$(file -b "${isofs_dir}/${install_dir}/boot/${arch}/vmlinuz-linux" | awk 'f{print;f=0} /version/{f=1}' RS=' ') + 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" + + # Add other aditional/extra files to ${install_dir}/boot/ + if [[ -e "${airootfs_dir}/boot/memtest86+/memtest.bin" ]]; then + # rename for PXE: https://wiki.archlinux.org/index.php/Syslinux#Using_memtest + install -m 0644 -- "${airootfs_dir}/boot/memtest86+/memtest.bin" "${isofs_dir}/${install_dir}/boot/memtest" + mkdir -p "${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 } # Prepare /isolinux -_make_isolinux() { +_make_boot_bios.syslinux.eltorito() { mkdir -p "${isofs_dir}/isolinux" - sed "s|%INSTALL_DIR%|${install_dir}|g" \ - "${profile}/isolinux/isolinux.cfg" > "${isofs_dir}/isolinux/isolinux.cfg" + sed "s|%ARCHISO_LABEL%|${iso_label}|g; + s|%INSTALL_DIR%|${install_dir}|g; + s|%ARCH%|${arch}|g" \ + "${profile}/isolinux/isolinux.cfg" > "${isofs_dir}/isolinux/isolinux.cfg" install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/isolinux.bin" "${isofs_dir}/isolinux/" install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/isohdpfx.bin" "${isofs_dir}/isolinux/" install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/ldlinux.c32" "${isofs_dir}/isolinux/" + + # isolinux.cfg loads syslinux.cfg + _run_once _make_boot_bios.syslinux.mbr } # Prepare /EFI on ISO-9660 @@ -437,30 +459,39 @@ _make_efi() { install -m 0644 -- "${profile}/efiboot/loader/loader.conf" "${isofs_dir}/loader/" sed "s|%ARCHISO_LABEL%|${iso_label}|g; - s|%INSTALL_DIR%|${install_dir}|g" \ + s|%INSTALL_DIR%|${install_dir}|g; + s|%ARCH%|${arch}|g" \ "${profile}/efiboot/loader/entries/archiso-x86_64-usb.conf" > \ "${isofs_dir}/loader/entries/archiso-x86_64.conf" # edk2-shell based UEFI shell # shellx64.efi is picked up automatically when on / - install -m 0644 -- "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" "${isofs_dir}/shellx64.efi" + if [[ -e "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" ]]; then + install -m 0644 -- "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" "${isofs_dir}/shellx64.efi" + fi } -# Prepare efiboot.img::/EFI for "El Torito" EFI boot mode -_make_efiboot() { +# Prepare kernel/initramfs on efiboot.img +_make_boot_on_fat() { + mkdir -p "${work_dir}/efiboot/EFI/archiso" + install -m 0644 -- "${airootfs_dir}/boot/vmlinuz-linux" "${work_dir}/efiboot/EFI/archiso/" + install -m 0644 -- "${isofs_dir}/${install_dir}/boot/${arch}/archiso.img" "${work_dir}/efiboot/EFI/archiso/" + if [[ -e "${airootfs_dir}/boot/intel-ucode.img" ]]; then + install -m 0644 -- "${airootfs_dir}/boot/intel-ucode.img" "${work_dir}/efiboot/EFI/archiso/" + fi + if [[ -e "${airootfs_dir}/boot/amd-ucode.img" ]]; then + install -m 0644 -- "${airootfs_dir}/boot/amd-ucode.img" "${work_dir}/efiboot/EFI/archiso/" + fi +} + +# Prepare efiboot.img::/EFI for EFI boot mode +_make_boot_uefi-x64.systemd-boot.esp() { mkdir -p "${isofs_dir}/EFI/archiso" mkfs.fat -C -n ARCHISO_EFI "${isofs_dir}/EFI/archiso/efiboot.img" 65536 mkdir -p "${work_dir}/efiboot" mount "${isofs_dir}/EFI/archiso/efiboot.img" "${work_dir}/efiboot" - mkdir -p "${work_dir}/efiboot/EFI/archiso" - install -m 0644 -- "${isofs_dir}/${install_dir}/boot/${arch}/vmlinuz-linux" "${work_dir}/efiboot/EFI/archiso/" - install -m 0644 -- "${isofs_dir}/${install_dir}/boot/${arch}/archiso.img" "${work_dir}/efiboot/EFI/archiso/" - - install -m 0644 -- "${isofs_dir}/${install_dir}/boot/intel-ucode.img" "${work_dir}/efiboot/EFI/archiso/" - install -m 0644 -- "${isofs_dir}/${install_dir}/boot/amd-ucode.img" "${work_dir}/efiboot/EFI/archiso/" - mkdir -p "${work_dir}/efiboot/EFI/BOOT" install -m 0644 -- "${airootfs_dir}/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \ "${work_dir}/efiboot/EFI/BOOT/BOOTx64.EFI" @@ -469,16 +500,29 @@ _make_efiboot() { install -m 0644 -- "${profile}/efiboot/loader/loader.conf" "${work_dir}/efiboot/loader/" sed "s|%ARCHISO_LABEL%|${iso_label}|g; - s|%INSTALL_DIR%|${install_dir}|g" \ + s|%INSTALL_DIR%|${install_dir}|g; + s|%ARCH%|${arch}|g" \ "${profile}/efiboot/loader/entries/archiso-x86_64-cd.conf" > \ "${work_dir}/efiboot/loader/entries/archiso-x86_64.conf" # shellx64.efi is picked up automatically when on / - install -m 0644 -- "${isofs_dir}/shellx64.efi" "${work_dir}/efiboot/" + if [[ -e "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" ]]; then + install -m 0644 -- "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" "${work_dir}/efiboot/shellx64.efi" + fi + + # Copy kernel and initramfs + _make_boot_on_fat umount -d "${work_dir}/efiboot" } +# Prepare efiboot.img::/EFI for "El Torito" EFI boot mode +_make_boot_uefi-x64.systemd-boot.eltorito() { + _run_once _make_boot_uefi-x64.systemd-boot.esp + # Set up /EFI on ISO-9660 + _run_once _make_efi +} + # Build airootfs filesystem image _make_prepare() { if [[ "${sfs_mode}" == "sfs" ]]; then @@ -494,7 +538,49 @@ _make_prepare() { # Build ISO _make_iso() { - command_iso "${iso_name}-${iso_version}-${arch}.iso" + local xorrisofs_options=() + + if [[ "${quiet}" == "y" ]]; then + xorrisofs_options+=('-quiet') + fi + # shellcheck disable=SC2076 + if [[ " ${bootmodes[*]} " =~ ' bios.syslinux.' ]]; then + if [[ ! -f "${isofs_dir}/isolinux/isolinux.bin" ]]; then + _msg_error "The file '${isofs_dir}/isolinux/isolinux.bin' does not exist." 1 + fi + if [[ ! -f "${isofs_dir}/isolinux/isohdpfx.bin" ]]; then + _msg_error "The file '${isofs_dir}/isolinux/isohdpfx.bin' does not exist." 1 + fi + xorrisofs_options+=( + '-eltorito-boot' 'isolinux/isolinux.bin' + '-eltorito-catalog' 'isolinux/boot.cat' + '-no-emul-boot' '-boot-load-size' '4' '-boot-info-table' + '-isohybrid-mbr' "${isofs_dir}/isolinux/isohdpfx.bin" + ) + fi + # shellcheck disable=SC2076 + if [[ " ${bootmodes[*]} " =~ ' uefi-x64.systemd-boot.' ]]; then + xorrisofs_options+=( + '-eltorito-alt-boot' + '-e' 'EFI/archiso/efiboot.img' + '-no-emul-boot' + '-isohybrid-gpt-basdat' + ) + fi + + _msg_info "Creating ISO image..." + xorriso -as mkisofs \ + -iso-level 3 \ + -full-iso9660-filenames \ + -rational-rock \ + -volid "${iso_label}" \ + -appid "${iso_application}" \ + -publisher "${iso_publisher}" \ + -preparer "prepared by ${app_name}" \ + "${xorrisofs_options[@]}" \ + -output "${out_dir}/${img_name}" \ + "${isofs_dir}/" + _msg_info "Done! | $(du -h -- "${out_dir}/${img_name}")" } # Read profile's values from profiledef.sh @@ -573,64 +659,16 @@ command_pkglist () { # Create an ISO9660 filesystem from "iso" directory. command_iso () { - local _iso_efi_boot_args=() - - if [[ ! -f "${isofs_dir}/isolinux/isolinux.bin" ]]; then - _msg_error "The file '${isofs_dir}/isolinux/isolinux.bin' does not exist." 1 - fi - if [[ ! -f "${isofs_dir}/isolinux/isohdpfx.bin" ]]; then - _msg_error "The file '${isofs_dir}/isolinux/isohdpfx.bin' does not exist." 1 - fi + bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito') # If exists, add an EFI "El Torito" boot image (FAT filesystem) to ISO-9660 image. if [[ -f "${isofs_dir}/EFI/archiso/efiboot.img" ]]; then - _iso_efi_boot_args+=( - '-eltorito-alt-boot' - '-e' 'EFI/archiso/efiboot.img' - '-no-emul-boot' - '-isohybrid-gpt-basdat' - ) + bootmodes+=('uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito') fi _show_config iso - mkdir -p -- "${out_dir}" - _msg_info "Creating ISO image..." - local _qflag="" - if [[ "${quiet}" == "y" ]]; then - xorriso -as mkisofs -quiet \ - -iso-level 3 \ - -full-iso9660-filenames \ - -rational-rock \ - -volid "${iso_label}" \ - -appid "${iso_application}" \ - -publisher "${iso_publisher}" \ - -preparer "prepared by ${app_name}" \ - -eltorito-boot isolinux/isolinux.bin \ - -eltorito-catalog isolinux/boot.cat \ - -no-emul-boot -boot-load-size 4 -boot-info-table \ - -isohybrid-mbr "${isofs_dir}/isolinux/isohdpfx.bin" \ - "${_iso_efi_boot_args[@]}" \ - -output "${out_dir}/${img_name}" \ - "${isofs_dir}/" - else - xorriso -as mkisofs \ - -iso-level 3 \ - -full-iso9660-filenames \ - -rational-rock \ - -volid "${iso_label}" \ - -appid "${iso_application}" \ - -publisher "${iso_publisher}" \ - -preparer "prepared by ${app_name}" \ - -eltorito-boot isolinux/isolinux.bin \ - -eltorito-catalog isolinux/boot.cat \ - -no-emul-boot -boot-load-size 4 -boot-info-table \ - -isohybrid-mbr "${isofs_dir}/isolinux/isohdpfx.bin" \ - "${_iso_efi_boot_args[@]}" \ - -output "${out_dir}/${img_name}" \ - "${isofs_dir}/" - fi - _msg_info "Done! | $(ls -sh -- "${out_dir}/${img_name}")" + _make_iso } # create airootfs.sfs filesystem, and push it in "iso" directory. @@ -684,12 +722,7 @@ command_build_profile() { _run_once _make_packages _run_once _make_customize_airootfs _run_once _make_pkglist - _run_once _make_boot - _run_once _make_boot_extra - _run_once _make_syslinux - _run_once _make_isolinux - _run_once _make_efi - _run_once _make_efiboot + _make_bootmodes _run_once _cleanup _run_once _make_prepare _run_once _make_iso diff --git a/configs/baseline/profiledef.sh b/configs/baseline/profiledef.sh new file mode 100644 index 0000000..9ced69e --- /dev/null +++ b/configs/baseline/profiledef.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +# shellcheck disable=SC2034 + +iso_name="archlinux-baseline" +iso_label="ARCH_$(date +%Y%m)" +iso_publisher="Arch Linux " +iso_application="Arch Linux baseline" +iso_version="$(date +%Y.%m.%d)" +install_dir="arch" +bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito') +arch="x86_64" +pacman_conf="pacman.conf" diff --git a/configs/releng/profiledef.sh b/configs/releng/profiledef.sh index 5eb5c5a..1aa93b6 100644 --- a/configs/releng/profiledef.sh +++ b/configs/releng/profiledef.sh @@ -7,6 +7,6 @@ iso_publisher="Arch Linux " iso_application="Arch Linux Live/Rescue CD" iso_version="$(date +%Y.%m.%d)" install_dir="arch" -bootmodes=() +bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito') arch="x86_64" pacman_conf="pacman.conf" -- cgit v1.2.3-54-g00ecf From e9f209efbf344213609d39b652e7bcbbfa14054d Mon Sep 17 00:00:00 2001 From: nl6720 Date: Wed, 12 Aug 2020 18:24:30 +0300 Subject: Deprecate build.sh scripts and old mkarchiso commands Replace build.sh scripts with calls to mkarchiso -B "profiledir" build_profile. Fixes https://gitlab.archlinux.org/archlinux/archiso/-/issues/37 . --- README.rst | 14 +- archiso/mkarchiso | 23 +- configs/baseline/build.sh | 113 +------- configs/releng/airootfs/root/customize_airootfs.sh | 2 +- configs/releng/build.sh | 306 +-------------------- 5 files changed, 22 insertions(+), 436 deletions(-) (limited to 'configs') diff --git a/README.rst b/README.rst index b65db6d..4c17082 100644 --- a/README.rst +++ b/README.rst @@ -32,8 +32,7 @@ Profiles Archiso comes with two profiles: **baseline** and **releng**. While both can serve as starting points for creating custom live media, **releng** is used to create the monthly installation medium. They can be found below `configs/baseline/ `_ and `configs/releng/ `_ -(respectively). Both profiles are defined by files to be placed into overlays (e.g. *airootfs* -> *the image's /*) and -dynamic actions (i.e. *build.sh* scripts). +(respectively). Both profiles are defined by files to be placed into overlays (e.g. *airootfs* -> *the image's /*). Create images ============= @@ -50,28 +49,27 @@ be lost on update). The examples below will assume an unmodified profile in a system location (unless noted otherwise). -It is advised to check the help information of the **build.sh** scripts in the profiles: +It is advised to check the help information of the **mkarchiso**: .. code:: bash - /usr/share/archiso/configs/releng/build.sh --help + mkarchiso -h Create images with packaged archiso ----------------------------------- .. code:: bash - /usr/share/archiso/configs/releng/build.sh -w path/to/work_dir -o path/to/out_dir + mkarchiso -B path/to/profile -w path/to/work_dir -o path/to/out_dir build_profile Create images with local clone ------------------------------ -Clone this repository and make sure to run with the local `mkarchiso `_ script in *PATH* (if it has -been modified): +Clone this repository and run: .. code:: bash - PATH="archiso:$PATH" ./configs/releng/build.sh -w path/to/work_dir -o path/to/out_dir + ./archiso/mkarchiso -B path/to/profile -w path/to/work_dir -o path/to/out_dir build_profile Testing ======= diff --git a/archiso/mkarchiso b/archiso/mkarchiso index 482d934..7602e62 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -92,8 +92,8 @@ _usage () { IFS='' read -r -d '' usagetext < general options: + -B Directory of the archiso profile to build -p PACKAGE(S) Package(s) to install, can be used multiple times - -r Run inside airootfs -C Config file for pacman. Default: '${pacman_conf}' -L