Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archiso
AgeCommit message (Collapse)Author
2021-01-26archiso_pxe_common: remove resolv.conf before copyChristian Hesse
Booting via PXE we want to keep our DNS configuration. So remove /etc/resolv.conf in new root before copying the current file. Without this systemd-resolved fallback nameservers are used and we see an error message when the root ships a symbolic link to systemd-resolved's stub-resolv.conf: cp: not writing through dangling symlink '/new_root/etc/resolv.conf'
2021-01-26mkarchiso: add version informationChristian Hesse
To date the iso version was used for iso volume information and iso file name. In my custom builds I do use it a lot more: * Inside the root fs: The system knows about its own version. I use this to: -> report the version to a server (poor man's inventory) -> let the system update itself * On the iso fs: The files are served via rsync, running systems transfer version file first to check for available update. * A grub environment file on the iso fs: Booting the iso from grub allows to create cow directory per version: loopback loop archlinux.iso load_env -f (loop)/arch/grubenv linux (loop)/arch/boot/x86_64/vmlinuz-linux ... \ cow_directory=archlinux/${VERSION} ... So let's just create these files.
2021-01-23mkarchiso: fix typosChristian Hesse
2021-01-07Combine sed commands to reduce file writesnl6720
2020-11-30Fix issues with file ownerships/modesDavid Runge
archiso/mkarchiso: Make sure to always compare absolute paths in `_make_custom_airootfs()` (as `realpath` is used). Remove `echo` calls that prevent the setting of actual file ownerships and modes. configs/releng/profiledef.sh: Set file mode of /root/.automated_script.sh to 755. Fixes #82
2020-11-30Keep all SYSLINUX files in /syslinuxnl6720
This gets rid of the duplicate ldlinux.c32 and the useless isolinux.cfg which only points to syslinux.cfg. Implements https://gitlab.archlinux.org/archlinux/archiso/-/issues/46 .
2020-11-30Prevent path traversal outside of $airootfs_dirnl6720
2020-11-30Allow specifying ownership and mode of custom airootfs files and directoriesnl6720
profiledef.sh can now contain an associative array called file_permissions which can be used to set custom ownership and mode of custom airootfs files. The array's keys contain the path and the value is a colon separated list of owner UID, owner GID and access mode. For example: file_permissions=( ["/etc/shadow"]="0:0:400" ) This means that mkarchiso now copies airootfs files (and directores) without permissions and anything that should be owned by a user other than root and/or if the mode should be something other than 644 for files and 755 for directories must to be listed in ${file_permission[@]} in profiledef.sh. Fixes https://gitlab.archlinux.org/archlinux/archiso/-/issues/61 .
2020-11-18Reset network interfaces at the end of the PXE boot to allow DHCP to runfdupoux
2020-11-18Fix evaluation bugs in mkarchisoDavid Runge
archiso/mkarchiso: Guard the call to `_mksignature()` in `_prepare_airootfs_image()` by an if statement. Using the `&&` logic leads to `_prepare_airootfs_image()` evaluating to false if `$gpg_key` is not set. Add `_msg_info()` calls to `_set_override()` which prevent the function from evaluating to false if no override is being done. Additionally this is great for debugging purposes. Add `_msg_info()` calls to `_read_profile()` (which is great for debugging purposes). Fixes #81
2020-11-14mkarchiso: add xorrisofs options from boot mode specific functions instead ↵nl6720
of hardcoding them in _build_iso
2020-11-14mkarchiso: validate profile right after reading itnl6720
Fixes https://gitlab.archlinux.org/archlinux/archiso/-/issues/76 .
2020-11-14mkarchiso: general cleanup and simplificationnl6720
- Remove remnants of the now removed legacy commands. - Improve readability by getting rid of some "if" statements when performing string comparisons. - Rename functions to make their purpose more clear. - Move some conditions from functions to their invocations.
2020-10-30Configure the image type and image creation options using profiles (#54)fdupoux
2020-10-29Remove build.sh support from profiles and mkarchisoDavid Runge
configs/{baseline,releng}/build.sh: Remove `build.sh` scripts. They were deprecated with v47. archiso/mkarchiso: Remove all `build.sh` related functionality (i.e. `command_pkglist()`, `command_iso()`, `command_prepare()`, `command_install()`, `command_init()`, `command_run()`). Rename `command_build_profile()` to `_build_profile()` to be more in line with the style of the other function naming. Change `_show_config()` to only print info about the profile and make no more use of parameters. Remove all help output related to legacy `build.sh` commands. Fixes #51
2020-10-24Set CacheDir and HookDir for profile more sanelyDavid Runge
archiso/mkarchiso: Change `_pacman()` to use the *modified* pacman.conf from the work_dir, instead of using the *unmodified* pacman.conf from the profile. Change `_make_pacman_conf()` to compare the system's and the profile's CacheDir setting and use the profile's CacheDir setting only if it's not the default and not the same as the system's. Always set the HookDir to the airootfs' override directory, so that no hooks from the host system are being run. Remove DBPath, LogFile and RootDir settings from the work_dir pacman.conf as they are otherwise referring to the host system, **even if** pacman is being called with the `-r` flag. Fix a typo in _make_custom_airootfs(). README.profile.rst: Add information about the pacman.conf in a profile and how configuration options behave, when used by mkarchiso. Fixes #73 Fixes #74
2020-10-24Move FAT image to a separate partition outside the ISO 9660 file systemnl6720
Support bios.syslinux.eltorito boot mode without bios.syslinux.mbr. bios.syslinux.mbr does not work without bios.syslinux.eltorito because -isohybrid-mbr requires the El Torito boot image. Support uefi-x64.systemd-boot.esp boot mode without uefi-x64.systemd-boot.eltorito and vice versa. If uefi-x64.systemd-boot.eltorito is used without uefi-x64.systemd-boot.esp, the El Torito boot image will be placed in the ISO 9660 file system as before. Note that an ISO created with only uefi-x64.systemd-boot.eltorito will still be bootable as a "hard disk" on OVMF. OVMF will boot the El Torito image. This change has the following effect on the partition tables: - *.eltorito options add El Torito boot catalog entries. MBR and GPT are not affected. - uefi-x64.systemd-boot.esp creates a protective MBR partition table and a GPT table that includes a Linux filesystem data partition for the ISO 9660 volume, an EFI system partition and a Microsoft basic data partition that maps the 300 KiB padding added by xorriso. - bios.syslinux.mbr (without uefi-x64.systemd-boot.esp): adds a MBR partition table and maps the ISO 9660 volume as a partition of type 0x83. No GPT is produced. - bios.syslinux.mbr (with uefi-x64.systemd-boot.esp): adds an second partition in the MBR (after 0xEE) starting from sector 0 to sector 1 with type 0 and marks it as bootable. This violates the GPT specification, but allows some systems to succesfully boot in BIOS mode from GPT. Fixes https://gitlab.archlinux.org/archlinux/archiso/-/issues/49
2020-10-07Ensure that _make_boot_uefi-x64.systemd-boot.esp can be re-run if it failsnl6720
Remove efiboot.img if it exists so that mkfs.fat does not fail.
2020-10-07Save SOURCE_DATE_EPOCH to a file and read it from the file when resuming a buildnl6720
Print the build date. Don't re-run mksquashfs if it succeeded, but the failure was in gpg signing. For example, if the gpg pinentry timed out.
2020-10-07Check command line parameter count instead of option count, and do it after ↵nl6720
evaluating option arguments Fixes b6241cb1d07fe38128a67ae73e1ee57085085eaf .
2020-10-04Don't require root privileges just to show a "No command specified" errornl6720
Check if a profile or command is specified before looking at EUID.
2020-10-03Replace bash arithmetic with awk functionsDavid Runge
archiso/mkarchiso: The bash arithmethics in _make_boot_uefi-x64.systemd-boot.esp() introduced rounding issues, that can lead to insufficient FAT image size for the files. Conversion functions for awk now replace the bash arithmetics and additionally a ceil() function rounds the calculated size up to the next full MiB. Add an info message about the size of the created FAT image. Fixes #70
2020-09-29Fix info message for legacy commandDavid Runge
archiso/mkarchiso: Change the way _show_config() displays information about the build environment, as displaying a profile directory as a legacy command to mkarchiso is confusing. The function now prints a deprecation message if '$command_name' is not a directory (i.e. not a profile). Remove 'command_' prefix from help output for legacy commands (the prefix is only in use for internal functions). Relates to !69 Fixes #60
2020-09-27Calculate required efiboot.img size instead of hardcoding itnl6720
Use du to count the file size of the kernel(s), initramfs images and boot loader (and its configuration). This allows to compress initramfs with something other than xz, or have more than one kernel installed. Fixes https://gitlab.archlinux.org/archlinux/archiso/-/issues/62 .
2020-09-27archiso/mkarchiso: do not hardcode the kernel and initramfs file namesnl6720
All kernels and initramfs images from airootfs are copied to ${install_dir}/boot/ on both ISO 9660 and FAT. This allows providing multiple kernels. The kernel package needs to be added to packages.x86_64 and the boot loader configuration files created/adjusted appropriately. Support all possible microcode initrd file names.
2020-09-27Use the same file paths in both ISO 9660 and FATnl6720
This allows to use only one systemd-boot configuration file per kernel. Fixes https://gitlab.archlinux.org/archlinux/archiso/-/issues/44 .
2020-09-27Do not rename the initramfs imagenl6720
This is a breaking change. archweb, archiso-manager and various documentation must be updated. * https://github.com/archlinux/archweb/blob/master/templates/releng/archlinux.ipxe * https://github.com/pierres/archiso-manager/blob/master/Makefile
2020-09-05Do not overwrite existing files when copying from /etc/skel/nl6720
Copy /etc/skel/ only for users with UID in range 1000–60000. Correct user home directory permission after copying files. Fixes all /etc/skel issues from https://bugs.archlinux.org/task/67729 .
2020-09-02Create directories and copy files to the FAT image using mtools instead of ↵nl6720
mounting the file system - mtools supports SOURCE_DATE_EPOCH. - The image file is operated on directly instead of mounting the file system. This is a prerequisite to limit the commands that run with root privileges. Related to https://gitlab.archlinux.org/archlinux/archiso/-/issues/40 . - Add a reminder comment to not get rid of the dosfstools dependency, since a mformat made FAT image can fail to boot on some systems.
2020-08-25Add missing declaration of override_install_dirDavid Runge
**archiso/mkarchiso**: In d90184a the unbound variable `override_install_dir` was introduced by accident. It is required to be set to empty string to provide override functionality for `install_dir`. Fixes #57
2020-08-25Pass profile directory as parameter to mkarchisoDavid Runge
**archiso/mkarchiso**: Change all override option parameters (i.e. `-A`, `-C`, `-D`, `-L`, `-P` and `-g`) to not directly override the global variable they are tied to, but instead using an `override_` prefixed variable. Add `_set_overrides()` to use `override_` prefixed variables (if set) to override those without a prefix. Remove `-B` (a profile directory) from the list of parameters. The profile directory is now provided as separate non-option parameter. Add a call to `_read_profile()`, `_set_overrides()` and `command_build_profile()` to the fallthrough option of the switch-case checking `command_name` - a non-option parameter to mkarchiso. This effectively provides the possibility to set the profile directory using a non-option parameter, while still maintaining compatibility to legacy named arguments used in the configs' `build.sh` scripts. Extend the warning in regards to legacy `build.sh` based commands to mkarchiso by providing an EOL with archiso v49. Change the help output to reflect the changes and further elaborate on the legacy commands used by `build.sh` scripts. Change help output to be ordered alphabetically. Add help output for `-r` and `-g` options. Call `_set_overrides()` for legacy commands that accept one or more of the overriden options (i.e. `command_init`, `command_install`, `command_prepare` and `command_iso`). Various style fixes. **configs/{baseline,releng}/build.sh**: Change call to mkarchiso to use the profile's directory as a named argument instead of an option-argument. **README.rst**: Fix documentation on how to call mkarchiso with a profile directory. Fix wording and ordering of option arguments for run_archiso documentation. Fixes #52
2020-08-21archiso/mkarchiso: reduce duplication and add more info messagesnl6720
Fixes to issues introduced in https://gitlab.archlinux.org/archlinux/archiso/-/merge_requests/59 : - _make_boot_on_fat(): copy initramfs from "${airootfs_dir}/boot/" not "${isofs_dir}/". Otherwise UEFI-only ISOs cannot be built. Some general fixes: - Replace mkdir with install. Unlike mkdir, install does not complain when the target exists. - Reduce excess newlines produced by messages. - Ensure FAT image gets unmounted in case the script is interrupted. - Create the ext4 image with mkfs.ext4 instead of truncate. - Do not rely on user and group names for chown commands. Use numeric UID and GID instead. - Minimize the times stderr is redirected to /dev/null. - Add missing '?' to getopts. - Standardize function definitions by removing spaces between the function name and () .
2020-08-18archiso/mkarchiso: correct the path of airootfs/etc/machine-idnl6720
Use "${airootfs_dir}". Fixes a mistake introduced when rebasing https://gitlab.archlinux.org/archlinux/archiso/-/merge_requests/64 .
2020-08-18Add Joliet file system to the ISOnl6720
Joliet ensures correct file names capitalization on operating systems that support Joliet but not support Rock Ridge. Implements https://gitlab.archlinux.org/archlinux/archiso/-/issues/45 .
2020-08-18archiso/mkarchiso: create an empty /etc/machine-idnl6720
Fixes https://gitlab.archlinux.org/archlinux/archiso/-/issues/42 .
2020-08-17Deprecate build.sh scripts and old mkarchiso commandsnl6720
Replace build.sh scripts with calls to mkarchiso -B "profiledir" build_profile. Fixes https://gitlab.archlinux.org/archlinux/archiso/-/issues/37 .
2020-08-17archiso/mkarchiso: delete all files in /boot not just the kernel and initramfsnl6720
There is nothing useful in /boot for the live system.
2020-08-17archiso/mkarchiso: allow choosing boot modes from profiledef.shnl6720
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!
2020-08-17archiso/mkarchiso: copy make_* functions from configs/releng/build.shnl6720
Adapt _make_* functions to mkarchiso. Related to https://gitlab.archlinux.org/archlinux/archiso/-/issues/37 .
2020-08-17archiso/mkarchiso: start preparing a build_profile commandnl6720
Nothing is implemented yet! configs/releng/profiledef.sh: A test profile.
2020-08-17archiso/mkarchiso: general bash improvementsnl6720
Quote all variables. Terminate option processing using '--' for commands that support it. Do not hardcode file descriptor. Compare integers with arithmetic comparison instead of string comparison. Replace echo with printf. Use heredoc for usage text. Don't print INFO messages when quiet is set. Export SOURCE_DATE_EPOCH.
2020-08-11archiso/initcpio/hooks/archiso: remove option terminator from the blockdev ↵nl6720
command Apparently blockdev does not support it. In an ISO made using '-s img' (Squashfs with dm-snapshot), it results in: blockdev: Unknown command: --
2020-07-30Ensure all files in the ISO's Rock Ridge file system are owned by rootnl6720
archiso/mkarchiso: Add the -rational-rock option to xorriso. This is a preparatory step for creating ISOs as a regular user. See https://gitlab.archlinux.org/archlinux/archiso/-/issues/40 .
2020-07-30Show mksquashfs progress bar when mkarchiso is run in verbose modenl6720
2020-07-29archiso/initcpio/install/archiso: fix GnuPG home directory permissionsnl6720
Gets rid of a gpg warning: gpg: WARNING: unsafe permissions on homedir '/tmp/mkinitcpio.*/root/gpg'
2020-07-29Add license and basic documentationDavid Runge
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
2020-07-17Separate custom comments from shellcheck commentsnl6720
Having a shellcheck directive and custom comments in the same line can trigger SC1107 on old versions of shellcheck.
2020-07-11Adding linting for initcpio scriptsDavid Runge
archiso/initcpio/install/*: Setting bash shebang for all scripts and making them comform with shellcheck. archiso/initcpio/{hooks,script}/*: Setting ash shebang for all scripts and making them comform with shellcheck (for dash, as shellcheck has no ash specific ruleset). Essentially the ash based scripts should be POSIX compliant as much as possible to have an easier time writing, debugging and maintaining them. Ensuring that variables are not treated as options and introducing variable quoting. .gitlab-ci.yml: Integrating shellcheck for initcpio scripts. Closes #32
2020-07-01Add amdgpu and mgag200 to the archiso_kms mkinitcpio hooknl6720
See https://wiki.archlinux.org/index.php/Kernel_mode_setting#Early_KMS_start .
2020-06-30Fixing issues with variable quoting and arraysDavid Runge
archiso/mkarchiso: Calls to _pacman() need to be done with multiple parameters (e.g. array) instead of one string, as string splitting is not done in that function anymore. Turning _iso_efi_boot_args from string into an array to have an easier time of passing it to xorriso. Calling xorriso within the if statements instead of providing -quiet via variable. Fixing command_install() to provide packages separately to _pacman() configs/releng/build.sh: Replacing all newlines when retrieving the packages from packages.x86_64 with spaces so they will be properly provided to "mkarchiso install".

Copyright © 2002-2022 Judd Vinet and Aaron Griffin. Copyright © 2022 Erich Eckner.
The Arch Linux name and logo are recognized trademarks. Some rights reserved. The registered trademark Linux® is used pursuant to a sublicense from LMI, the exclusive licensee of Linus Torvalds, owner of the mark on a world-wide basis.