mirror of
https://github.com/archlinux/archiso.git
synced 2024-09-19 03:30:20 -06:00
Fix optional shellcheck warnings
Additionally fix a few code style issues found with shfmt.
This commit is contained in:
nl6720
parent
40dbfcfaf0
commit
28a3a54c5f
7 changed files with 352 additions and 351 deletions
|
|
@ -16,6 +16,10 @@ charset = utf-8
|
|||
indent_style = space
|
||||
indent_size = 4
|
||||
max_line_length = 120
|
||||
# for shfmt
|
||||
switch_case_indent = true
|
||||
binary_next_line = true
|
||||
|
||||
|
||||
[*.{yml,yaml}]
|
||||
end_of_line = lf
|
||||
|
|
@ -32,3 +36,6 @@ trim_trailing_whitespace = true
|
|||
charset = utf-8
|
||||
indent_style = space
|
||||
indent_size = 2
|
||||
|
||||
[Makefile]
|
||||
indent_style = tab
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ cleanup() {
|
|||
# clean up temporary directories
|
||||
print_section_start "cleanup" "Cleaning up temporary directory"
|
||||
|
||||
if [ -n "${tmpdir_base:-}" ]; then
|
||||
if [[ -n "${tmpdir_base:-}" ]]; then
|
||||
rm -fr "${tmpdir_base}"
|
||||
fi
|
||||
|
||||
|
|
@ -73,11 +73,11 @@ create_checksums() {
|
|||
for _file_path in "$@"; do
|
||||
cd "$(dirname "${_file_path}")"
|
||||
_file_name="$(basename "${_file_path}")"
|
||||
b2sum "${_file_name}" > "${_file_name}.b2"
|
||||
md5sum "${_file_name}" > "${_file_name}.md5"
|
||||
sha1sum "${_file_name}" > "${_file_name}.sha1"
|
||||
sha256sum "${_file_name}" > "${_file_name}.sha256"
|
||||
sha512sum "${_file_name}" > "${_file_name}.sha512"
|
||||
b2sum "${_file_name}" >"${_file_name}.b2"
|
||||
md5sum "${_file_name}" >"${_file_name}.md5"
|
||||
sha1sum "${_file_name}" >"${_file_name}.sha1"
|
||||
sha256sum "${_file_name}" >"${_file_name}.sha256"
|
||||
sha512sum "${_file_name}" >"${_file_name}.sha512"
|
||||
ls -lah "${_file_name}."{b2,md5,sha{1,256,512}}
|
||||
cat "${_file_name}."{b2,md5,sha{1,256,512}}
|
||||
done
|
||||
|
|
@ -128,8 +128,9 @@ create_metrics() {
|
|||
# shellcheck disable=SC2046
|
||||
# shellcheck disable=SC2183
|
||||
printf 'initramfs_size_mebibytes{image="%s",initramfs="%s"} %s\n' \
|
||||
$(du -m -- "${tmpdir}/iso/"*/boot/**/initramfs*.img | \
|
||||
awk -v profile="${profile}" \
|
||||
$(
|
||||
du -m -- "${tmpdir}/iso/"*/boot/**/initramfs*.img \
|
||||
| awk -v profile="${profile}" \
|
||||
'function basename(file) {
|
||||
sub(".*/", "", file)
|
||||
return file
|
||||
|
|
@ -154,7 +155,7 @@ create_metrics() {
|
|||
"$(sort -u -- "${tmpdir}/"*/bootstrap/root.*/pkglist.*.txt | wc -l)"
|
||||
;;
|
||||
esac
|
||||
} > "${_metrics}"
|
||||
} >"${_metrics}"
|
||||
ls -lah "${_metrics}"
|
||||
cat "${_metrics}"
|
||||
|
||||
|
|
@ -169,7 +170,7 @@ create_ephemeral_pgp_key() {
|
|||
mkdir -p "${gnupg_homedir}"
|
||||
chmod 700 "${gnupg_homedir}"
|
||||
|
||||
cat << __EOF__ > "${gnupg_homedir}"/gpg.conf
|
||||
cat <<__EOF__ >"${gnupg_homedir}"/gpg.conf
|
||||
quiet
|
||||
batch
|
||||
no-tty
|
||||
|
|
@ -232,7 +233,7 @@ create_ephemeral_codesigning_keys() {
|
|||
cp -- /etc/ssl/openssl.cnf "${codesigning_conf}"
|
||||
cp -- /etc/ssl/openssl.cnf "${ca_conf}"
|
||||
touch "${ca_dir}/index.txt"
|
||||
echo "1000" > "${ca_dir}/serial"
|
||||
echo "1000" >"${ca_dir}/serial"
|
||||
|
||||
# Prepare the ca configuration for the change in directory
|
||||
sed -i "s#/etc/ssl#${ca_dir}#g" "${ca_conf}"
|
||||
|
|
@ -250,7 +251,7 @@ create_ephemeral_codesigning_keys() {
|
|||
-subj "${ca_subj}" \
|
||||
-out "${ca_cert}"
|
||||
|
||||
cat << EOF >> "${ca_conf}"
|
||||
cat <<EOF >>"${ca_conf}"
|
||||
|
||||
[ v3_intermediate_ca ]
|
||||
# Extensions for a typical intermediate CA ('man x509v3_config').
|
||||
|
|
@ -261,7 +262,7 @@ keyUsage = critical, digitalSignature, cRLSign, keyCertSign
|
|||
|
||||
EOF
|
||||
|
||||
cat << EOF >> "${codesigning_conf}"
|
||||
cat <<EOF >>"${codesigning_conf}"
|
||||
|
||||
[codesigning]
|
||||
keyUsage=digitalSignature
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ _cleanup_pacstrap_dir() {
|
|||
# Create /etc/machine-id with special value 'uninitialized': the final id is
|
||||
# generated on first boot, systemd's first-boot mechanism applies (see machine-id(5))
|
||||
rm -f -- "${pacstrap_dir}/etc/machine-id"
|
||||
printf 'uninitialized\n' > "${pacstrap_dir}/etc/machine-id"
|
||||
printf 'uninitialized\n' >"${pacstrap_dir}/etc/machine-id"
|
||||
|
||||
_msg_info "Done!"
|
||||
}
|
||||
|
|
@ -204,7 +204,7 @@ _mkairootfs_ext4+squashfs() {
|
|||
[[ ! "${quiet}" == "y" ]] || mkfs_ext4_options+=('-q')
|
||||
rm -f -- "${pacstrap_dir}.img"
|
||||
E2FSPROGS_FAKE_TIME="${SOURCE_DATE_EPOCH}" mkfs.ext4 "${mkfs_ext4_options[@]}" -- "${pacstrap_dir}.img" 32G
|
||||
tune2fs -c 0 -i 0 -- "${pacstrap_dir}.img" > /dev/null
|
||||
tune2fs -c 0 -i 0 -- "${pacstrap_dir}.img" >/dev/null
|
||||
_msg_info "Done!"
|
||||
|
||||
install -d -m 0755 -- "${isofs_dir}/${install_dir}/${arch}"
|
||||
|
|
@ -245,9 +245,9 @@ _mkchecksum() {
|
|||
_msg_info "Creating checksum file for self-test..."
|
||||
cd -- "${isofs_dir}/${install_dir}/${arch}"
|
||||
if [[ -e "${isofs_dir}/${install_dir}/${arch}/airootfs.sfs" ]]; then
|
||||
sha512sum airootfs.sfs > airootfs.sha512
|
||||
sha512sum airootfs.sfs >airootfs.sha512
|
||||
elif [[ -e "${isofs_dir}/${install_dir}/${arch}/airootfs.erofs" ]]; then
|
||||
sha512sum airootfs.erofs > airootfs.sha512
|
||||
sha512sum airootfs.erofs >airootfs.sha512
|
||||
fi
|
||||
cd -- "${OLDPWD}"
|
||||
_msg_info "Done!"
|
||||
|
|
@ -280,12 +280,12 @@ _run_once() {
|
|||
# Set up custom pacman.conf with custom cache and pacman hook directories.
|
||||
_make_pacman_conf() {
|
||||
local _cache_dirs _system_cache_dirs _profile_cache_dirs
|
||||
_system_cache_dirs="$(pacman-conf CacheDir| tr '\n' ' ')"
|
||||
_profile_cache_dirs="$(pacman-conf --config "${pacman_conf}" CacheDir| tr '\n' ' ')"
|
||||
_system_cache_dirs="$(pacman-conf CacheDir | tr '\n' ' ')"
|
||||
_profile_cache_dirs="$(pacman-conf --config "${pacman_conf}" CacheDir | tr '\n' ' ')"
|
||||
|
||||
# Only use the profile's CacheDir, if it is not the default and not the same as the system cache dir.
|
||||
if [[ "${_profile_cache_dirs}" != "/var/cache/pacman/pkg" ]] && \
|
||||
[[ "${_system_cache_dirs}" != "${_profile_cache_dirs}" ]]; then
|
||||
if [[ "${_profile_cache_dirs}" != "/var/cache/pacman/pkg" ]] \
|
||||
&& [[ "${_system_cache_dirs}" != "${_profile_cache_dirs}" ]]; then
|
||||
_cache_dirs="${_profile_cache_dirs}"
|
||||
else
|
||||
_cache_dirs="${_system_cache_dirs}"
|
||||
|
|
@ -297,9 +297,9 @@ _make_pacman_conf() {
|
|||
# append CacheDir and HookDir to [options] section
|
||||
# HookDir is *always* set to the airootfs' override directory
|
||||
# see `man 8 pacman` for further info
|
||||
pacman-conf --config "${pacman_conf}" | \
|
||||
sed "/CacheDir/d;/DBPath/d;/HookDir/d;/LogFile/d;/RootDir/d;/\[options\]/a CacheDir = ${_cache_dirs}
|
||||
/\[options\]/a HookDir = ${pacstrap_dir}/etc/pacman.d/hooks/" > "${work_dir}/${buildmode}.pacman.conf"
|
||||
pacman-conf --config "${pacman_conf}" \
|
||||
| sed "/CacheDir/d;/DBPath/d;/HookDir/d;/LogFile/d;/RootDir/d;/\[options\]/a CacheDir = ${_cache_dirs}
|
||||
/\[options\]/a HookDir = ${pacstrap_dir}/etc/pacman.d/hooks/" >"${work_dir}/${buildmode}.pacman.conf"
|
||||
}
|
||||
|
||||
# Prepare working directory and copy custom root file system files.
|
||||
|
|
@ -314,7 +314,7 @@ _make_custom_airootfs() {
|
|||
cp -af --no-preserve=ownership,mode -- "${profile}/airootfs/." "${pacstrap_dir}"
|
||||
# Set ownership and mode for files and directories
|
||||
for filename in "${!file_permissions[@]}"; do
|
||||
IFS=':' read -ra permissions <<< "${file_permissions["${filename}"]}"
|
||||
IFS=':' read -ra permissions <<<"${file_permissions["${filename}"]}"
|
||||
# Prevent file path traversal outside of $pacstrap_dir
|
||||
if [[ "$(realpath -q -- "${pacstrap_dir}${filename}")" != "${pacstrap_dir}"* ]]; then
|
||||
_msg_error "Failed to set permissions on '${pacstrap_dir}${filename}'. Outside of valid path." 1
|
||||
|
|
@ -355,7 +355,7 @@ _make_packages() {
|
|||
|
||||
# Unset TMPDIR to work around https://bugs.archlinux.org/task/70580
|
||||
if [[ "${quiet}" = "y" ]]; then
|
||||
env -u TMPDIR pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}" &> /dev/null
|
||||
env -u TMPDIR pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}" &>/dev/null
|
||||
else
|
||||
env -u TMPDIR pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}"
|
||||
fi
|
||||
|
|
@ -399,7 +399,7 @@ _make_customize_airootfs() {
|
|||
else
|
||||
_msg_error "Failed to set permissions on '${pacstrap_dir}${passwd[5]}'. Outside of valid path." 1
|
||||
fi
|
||||
done < "${profile}/airootfs/etc/passwd"
|
||||
done <"${profile}/airootfs/etc/passwd"
|
||||
_msg_info "Done!"
|
||||
fi
|
||||
|
||||
|
|
@ -452,7 +452,7 @@ _make_bootmode_bios.syslinux.mbr() {
|
|||
s|%ARCHISO_UUID%|${iso_uuid}|g;
|
||||
s|%INSTALL_DIR%|${install_dir}|g;
|
||||
s|%ARCH%|${arch}|g" \
|
||||
"${_cfg}" > "${isofs_dir}/boot/syslinux/${_cfg##*/}"
|
||||
"${_cfg}" >"${isofs_dir}/boot/syslinux/${_cfg##*/}"
|
||||
done
|
||||
if [[ -e "${profile}/syslinux/splash.png" ]]; then
|
||||
install -m 0644 -- "${profile}/syslinux/splash.png" "${isofs_dir}/boot/syslinux/"
|
||||
|
|
@ -527,10 +527,11 @@ _make_efibootimg() {
|
|||
fi
|
||||
|
||||
# Convert from bytes to KiB and round up to the next full MiB with an additional MiB for reserved sectors.
|
||||
imgsize_kib="$(awk 'function ceil(x){return int(x)+(x>int(x))}
|
||||
imgsize_kib="$(
|
||||
awk 'function ceil(x){return int(x)+(x>int(x))}
|
||||
function byte_to_kib(x){return x/1024}
|
||||
function mib_to_kib(x){return x*1024}
|
||||
END {print mib_to_kib(ceil((byte_to_kib($1)+1024)/1024))}' <<< "${imgsize_bytes}"
|
||||
END {print mib_to_kib(ceil((byte_to_kib($1)+1024)/1024))}' <<<"${imgsize_bytes}"
|
||||
)"
|
||||
# The FAT image must be created with mkfs.fat not mformat, as some systems have issues with mformat made images:
|
||||
# https://lists.gnu.org/archive/html/grub-devel/2019-04/msg00099.html
|
||||
|
|
@ -539,7 +540,7 @@ _make_efibootimg() {
|
|||
if [[ "${quiet}" == "y" ]]; then
|
||||
# mkfs.fat does not have a -q/--quiet option, so redirect stdout to /dev/null instead
|
||||
# https://github.com/dosfstools/dosfstools/issues/103
|
||||
mkfs.fat -C -n ARCHISO_EFI "${efibootimg}" "${imgsize_kib}" > /dev/null
|
||||
mkfs.fat -C -n ARCHISO_EFI "${efibootimg}" "${imgsize_kib}" >/dev/null
|
||||
else
|
||||
mkfs.fat -C -n ARCHISO_EFI "${efibootimg}" "${imgsize_kib}"
|
||||
fi
|
||||
|
|
@ -553,7 +554,7 @@ _make_common_bootmode_grub_copy_to_isofs() {
|
|||
local files_to_copy=()
|
||||
|
||||
files_to_copy+=("${work_dir}/grub/"*)
|
||||
if compgen -G "${profile}/grub/!(*.cfg)" &> /dev/null; then
|
||||
if compgen -G "${profile}/grub/!(*.cfg)" &>/dev/null; then
|
||||
files_to_copy+=("${profile}/grub/"!(*.cfg))
|
||||
fi
|
||||
install -d -m 0755 -- "${isofs_dir}/boot/grub"
|
||||
|
|
@ -561,7 +562,7 @@ _make_common_bootmode_grub_copy_to_isofs() {
|
|||
}
|
||||
|
||||
# Prepare GRUB configuration files
|
||||
_make_common_bootmode_grub_cfg(){
|
||||
_make_common_bootmode_grub_cfg() {
|
||||
local _cfg search_filename
|
||||
|
||||
install -d -- "${work_dir}/grub"
|
||||
|
|
@ -569,7 +570,7 @@ _make_common_bootmode_grub_cfg(){
|
|||
# Create a /boot/grub/YYYY-mm-dd-HH-MM-SS-00.uuid file on ISO 9660. GRUB will search for it to find the ISO
|
||||
# volume. This is similar to what grub-mkrescue does, except it places the file in /.disk/, but we opt to use a
|
||||
# directory that does not start with a dot to avoid it being accidentally missed when copying the ISO's contents.
|
||||
: > "${work_dir}/grub/${iso_uuid}.uuid"
|
||||
: >"${work_dir}/grub/${iso_uuid}.uuid"
|
||||
search_filename="/boot/grub/${iso_uuid}.uuid"
|
||||
|
||||
# Fill GRUB configuration files
|
||||
|
|
@ -579,7 +580,7 @@ _make_common_bootmode_grub_cfg(){
|
|||
s|%INSTALL_DIR%|${install_dir}|g;
|
||||
s|%ARCH%|${arch}|g;
|
||||
s|%ARCHISO_SEARCH_FILENAME%|${search_filename}|g" \
|
||||
"${_cfg}" > "${work_dir}/grub/${_cfg##*/}"
|
||||
"${_cfg}" >"${work_dir}/grub/${_cfg##*/}"
|
||||
done
|
||||
|
||||
# Prepare grub.cfg that will be embedded inside the GRUB binaries
|
||||
|
|
@ -622,7 +623,7 @@ else
|
|||
fi
|
||||
EOF
|
||||
grubembedcfg="${grubembedcfg//'%ARCHISO_SEARCH_FILENAME%'/"${search_filename}"}"
|
||||
printf '%s\n' "$grubembedcfg" > "${work_dir}/grub-embed.cfg"
|
||||
printf '%s\n' "$grubembedcfg" >"${work_dir}/grub-embed.cfg"
|
||||
|
||||
# Write grubenv
|
||||
printf '%.1024s' \
|
||||
|
|
@ -634,7 +635,7 @@ EOF
|
|||
"${arch}" \
|
||||
"${search_filename}" \
|
||||
"$(printf '%0.1s' "#"{1..1024})")" \
|
||||
> "${work_dir}/grub/grubenv"
|
||||
>"${work_dir}/grub/grubenv"
|
||||
}
|
||||
|
||||
_make_bootmode_uefi-ia32.grub.esp() {
|
||||
|
|
@ -866,7 +867,7 @@ _make_bootmode_uefi-x64.systemd-boot.eltorito() {
|
|||
sed "s|%ARCHISO_LABEL%|${iso_label}|g;
|
||||
s|%INSTALL_DIR%|${install_dir}|g;
|
||||
s|%ARCH%|${arch}|g" \
|
||||
"${_conf}" > "${isofs_dir}/loader/entries/${_conf##*/}"
|
||||
"${_conf}" >"${isofs_dir}/loader/entries/${_conf##*/}"
|
||||
done
|
||||
|
||||
# edk2-shell based UEFI shell
|
||||
|
|
@ -928,13 +929,13 @@ _validate_requirements_bootmode_uefi-x64.systemd-boot.esp() {
|
|||
fi
|
||||
|
||||
# Check if mkfs.fat is available
|
||||
if ! command -v mkfs.fat &> /dev/null; then
|
||||
if ! command -v mkfs.fat &>/dev/null; then
|
||||
(( validation_error=validation_error+1 ))
|
||||
_msg_error "Validating '${bootmode}': mkfs.fat is not available on this host. Install 'dosfstools'!" 0
|
||||
fi
|
||||
|
||||
# Check if mmd and mcopy are available
|
||||
if ! { command -v mmd &> /dev/null && command -v mcopy &> /dev/null; }; then
|
||||
if ! { command -v mmd &>/dev/null && command -v mcopy &>/dev/null; }; then
|
||||
(( validation_error=validation_error+1 ))
|
||||
_msg_error "Validating '${bootmode}': mmd and/or mcopy are not available on this host. Install 'mtools'!" 0
|
||||
fi
|
||||
|
|
@ -978,7 +979,7 @@ _validate_requirements_bootmode_uefi-x64.systemd-boot.eltorito() {
|
|||
|
||||
_validate_requirements_bootmode_uefi-ia32.grub.esp() {
|
||||
# Check if GRUB is available
|
||||
if ! command -v grub-mkstandalone &> /dev/null; then
|
||||
if ! command -v grub-mkstandalone &>/dev/null; then
|
||||
(( validation_error=validation_error+1 ))
|
||||
_msg_error "Validating '${bootmode}': grub-install is not available on this host. Install 'grub'!" 0
|
||||
fi
|
||||
|
|
@ -1005,19 +1006,19 @@ _validate_requirements_bootmode_uefi-x64.grub.esp() {
|
|||
fi
|
||||
|
||||
# Check if GRUB is available
|
||||
if ! command -v grub-mkstandalone &> /dev/null; then
|
||||
if ! command -v grub-mkstandalone &>/dev/null; then
|
||||
(( validation_error=validation_error+1 ))
|
||||
_msg_error "Validating '${bootmode}': grub-install is not available on this host. Install 'grub'!" 0
|
||||
fi
|
||||
|
||||
# Check if mkfs.fat is available
|
||||
if ! command -v mkfs.fat &> /dev/null; then
|
||||
if ! command -v mkfs.fat &>/dev/null; then
|
||||
(( validation_error=validation_error+1 ))
|
||||
_msg_error "Validating '${bootmode}': mkfs.fat is not available on this host. Install 'dosfstools'!" 0
|
||||
fi
|
||||
|
||||
# Check if mmd and mcopy are available
|
||||
if ! { command -v mmd &> /dev/null && command -v mcopy &> /dev/null; }; then
|
||||
if ! { command -v mmd &>/dev/null && command -v mcopy &>/dev/null; }; then
|
||||
_msg_error "Validating '${bootmode}': mmd and/or mcopy are not available on this host. Install 'mtools'!" 0
|
||||
fi
|
||||
|
||||
|
|
@ -1146,14 +1147,14 @@ _sign_netboot_artifacts() {
|
|||
}
|
||||
|
||||
_validate_requirements_airootfs_image_type_squashfs() {
|
||||
if ! command -v mksquashfs &> /dev/null; then
|
||||
if ! command -v mksquashfs &>/dev/null; then
|
||||
(( validation_error=validation_error+1 ))
|
||||
_msg_error "Validating '${airootfs_image_type}': mksquashfs is not available on this host. Install 'squashfs-tools'!" 0
|
||||
fi
|
||||
}
|
||||
|
||||
_validate_requirements_airootfs_image_type_ext4+squashfs() {
|
||||
if ! { command -v mkfs.ext4 &> /dev/null && command -v tune2fs &> /dev/null; }; then
|
||||
if ! { command -v mkfs.ext4 &>/dev/null && command -v tune2fs &>/dev/null; }; then
|
||||
(( validation_error=validation_error+1 ))
|
||||
_msg_error "Validating '${airootfs_image_type}': mkfs.ext4 and/or tune2fs is not available on this host. Install 'e2fsprogs'!" 0
|
||||
fi
|
||||
|
|
@ -1161,22 +1162,22 @@ _validate_requirements_airootfs_image_type_ext4+squashfs() {
|
|||
}
|
||||
|
||||
_validate_requirements_airootfs_image_type_erofs() {
|
||||
if ! command -v mkfs.erofs &> /dev/null; then
|
||||
if ! command -v mkfs.erofs &>/dev/null; then
|
||||
(( validation_error=validation_error+1 ))
|
||||
_msg_error "Validating '${airootfs_image_type}': mkfs.erofs is not available on this host. Install 'erofs-utils'!" 0
|
||||
fi
|
||||
}
|
||||
|
||||
_validate_common_requirements_buildmode_all() {
|
||||
if ! command -v pacman &> /dev/null; then
|
||||
if ! command -v pacman &>/dev/null; then
|
||||
(( validation_error=validation_error+1 ))
|
||||
_msg_error "Validating build mode '${_buildmode}': pacman is not available on this host. Install 'pacman'!" 0
|
||||
fi
|
||||
if ! command -v find &> /dev/null; then
|
||||
if ! command -v find &>/dev/null; then
|
||||
(( validation_error=validation_error+1 ))
|
||||
_msg_error "Validating build mode '${_buildmode}': find is not available on this host. Install 'findutils'!" 0
|
||||
fi
|
||||
if ! command -v gzip &> /dev/null; then
|
||||
if ! command -v gzip &>/dev/null; then
|
||||
(( validation_error=validation_error+1 ))
|
||||
_msg_error "Validating build mode '${_buildmode}': gzip is not available on this host. Install 'gzip'!" 0
|
||||
fi
|
||||
|
|
@ -1200,7 +1201,7 @@ _validate_requirements_buildmode_bootstrap() {
|
|||
fi
|
||||
|
||||
_validate_common_requirements_buildmode_all
|
||||
if ! command -v bsdtar &> /dev/null; then
|
||||
if ! command -v bsdtar &>/dev/null; then
|
||||
(( validation_error=validation_error+1 ))
|
||||
_msg_error "Validating build mode '${_buildmode}': bsdtar is not available on this host. Install 'libarchive'!" 0
|
||||
fi
|
||||
|
|
@ -1237,15 +1238,15 @@ _validate_common_requirements_buildmode_iso_netboot() {
|
|||
_msg_error "Two certificates are required for codesigning netboot artifacts, but '${cert_list[*]}' is provided." 0
|
||||
fi
|
||||
|
||||
if ! command -v openssl &> /dev/null; then
|
||||
if ! command -v openssl &>/dev/null; then
|
||||
(( validation_error=validation_error+1 ))
|
||||
_msg_error "Validating build mode '${_buildmode}': openssl is not available on this host. Install 'openssl'!" 0
|
||||
fi
|
||||
fi
|
||||
|
||||
# Check if the specified airootfs_image_type is supported
|
||||
if typeset -f "_mkairootfs_${airootfs_image_type}" &> /dev/null; then
|
||||
if typeset -f "_validate_requirements_airootfs_image_type_${airootfs_image_type}" &> /dev/null; then
|
||||
if typeset -f "_mkairootfs_${airootfs_image_type}" &>/dev/null; then
|
||||
if typeset -f "_validate_requirements_airootfs_image_type_${airootfs_image_type}" &>/dev/null; then
|
||||
"_validate_requirements_airootfs_image_type_${airootfs_image_type}"
|
||||
else
|
||||
_msg_warning "Function '_validate_requirements_airootfs_image_type_${airootfs_image_type}' does not exist. Validating the requirements of '${airootfs_image_type}' airootfs image type will not be possible."
|
||||
|
|
@ -1265,8 +1266,8 @@ _validate_requirements_buildmode_iso() {
|
|||
_msg_error "No boot modes specified in '${profile}/profiledef.sh'." 0
|
||||
fi
|
||||
for bootmode in "${bootmodes[@]}"; do
|
||||
if typeset -f "_make_bootmode_${bootmode}" &> /dev/null; then
|
||||
if typeset -f "_validate_requirements_bootmode_${bootmode}" &> /dev/null; then
|
||||
if typeset -f "_make_bootmode_${bootmode}" &>/dev/null; then
|
||||
if typeset -f "_validate_requirements_bootmode_${bootmode}" &>/dev/null; then
|
||||
"_validate_requirements_bootmode_${bootmode}"
|
||||
else
|
||||
_msg_warning "Function '_validate_requirements_bootmode_${bootmode}' does not exist. Validating the requirements of '${bootmode}' boot mode will not be possible."
|
||||
|
|
@ -1277,7 +1278,7 @@ _validate_requirements_buildmode_iso() {
|
|||
fi
|
||||
done
|
||||
|
||||
if ! command -v awk &> /dev/null; then
|
||||
if ! command -v awk &>/dev/null; then
|
||||
(( validation_error=validation_error+1 ))
|
||||
_msg_error "Validating build mode '${_buildmode}': awk is not available on this host. Install 'awk'!" 0
|
||||
fi
|
||||
|
|
@ -1488,7 +1489,7 @@ _build_bootstrap_image() {
|
|||
cd -- "${_bootstrap_parent}"
|
||||
|
||||
_msg_info "Creating bootstrap image..."
|
||||
bsdtar -cf - "root.${arch}" | gzip -cn9 > "${out_dir}/${image_name}"
|
||||
bsdtar -cf - "root.${arch}" | gzip -cn9 >"${out_dir}/${image_name}"
|
||||
_msg_info "Done!"
|
||||
du -h -- "${out_dir}/${image_name}"
|
||||
cd -- "${OLDPWD}"
|
||||
|
|
@ -1515,7 +1516,7 @@ _build_iso_image() {
|
|||
|
||||
# Add required xorrisofs options for each boot mode
|
||||
for bootmode in "${bootmodes[@]}"; do
|
||||
typeset -f "_add_xorrisofs_options_${bootmode}" &> /dev/null && "_add_xorrisofs_options_${bootmode}"
|
||||
typeset -f "_add_xorrisofs_options_${bootmode}" &>/dev/null && "_add_xorrisofs_options_${bootmode}"
|
||||
done
|
||||
|
||||
rm -f -- "${out_dir}/${image_name}"
|
||||
|
|
@ -1592,8 +1593,8 @@ _validate_options() {
|
|||
|
||||
# Check if the specified buildmodes are supported
|
||||
for _buildmode in "${buildmodes[@]}"; do
|
||||
if typeset -f "_build_buildmode_${_buildmode}" &> /dev/null; then
|
||||
if typeset -f "_validate_requirements_buildmode_${_buildmode}" &> /dev/null; then
|
||||
if typeset -f "_build_buildmode_${_buildmode}" &>/dev/null; then
|
||||
if typeset -f "_validate_requirements_buildmode_${_buildmode}" &>/dev/null; then
|
||||
"_validate_requirements_buildmode_${_buildmode}"
|
||||
else
|
||||
_msg_warning "Function '_validate_requirements_buildmode_${_buildmode}' does not exist. Validating the requirements of '${_buildmode}' build mode will not be possible."
|
||||
|
|
@ -1689,12 +1690,12 @@ _make_version() {
|
|||
_msg_info "Creating version files..."
|
||||
# Write version file to system installation dir
|
||||
rm -f -- "${pacstrap_dir}/version"
|
||||
printf '%s\n' "${iso_version}" > "${pacstrap_dir}/version"
|
||||
printf '%s\n' "${iso_version}" >"${pacstrap_dir}/version"
|
||||
|
||||
if [[ "${buildmode}" == @("iso"|"netboot") ]]; then
|
||||
install -d -m 0755 -- "${isofs_dir}/${install_dir}"
|
||||
# Write version file to ISO 9660
|
||||
printf '%s\n' "${iso_version}" > "${isofs_dir}/${install_dir}/version"
|
||||
printf '%s\n' "${iso_version}" >"${isofs_dir}/${install_dir}/version"
|
||||
|
||||
fi
|
||||
if [[ "${buildmode}" == "iso" ]]; then
|
||||
|
|
@ -1704,7 +1705,7 @@ _make_version() {
|
|||
rm -f -- "${isofs_dir}/${install_dir}/grubenv"
|
||||
printf '%.1024s' "$(printf '# GRUB Environment Block\nNAME=%s\nVERSION=%s\n%s' \
|
||||
"${iso_name}" "${iso_version}" "$(printf '%0.1s' "#"{1..1024})")" \
|
||||
> "${isofs_dir}/${install_dir}/grubenv"
|
||||
>"${isofs_dir}/${install_dir}/grubenv"
|
||||
fi
|
||||
|
||||
# Append IMAGE_ID & IMAGE_VERSION to os-release
|
||||
|
|
@ -1716,7 +1717,7 @@ _make_version() {
|
|||
_msg_warning "os-release file '${_os_release}' is outside of valid path."
|
||||
else
|
||||
[[ ! -e "${_os_release}" ]] || sed -i '/^IMAGE_ID=/d;/^IMAGE_VERSION=/d' "${_os_release}"
|
||||
printf 'IMAGE_ID=%s\nIMAGE_VERSION=%s\n' "${iso_name}" "${iso_version}" >> "${_os_release}"
|
||||
printf 'IMAGE_ID=%s\nIMAGE_VERSION=%s\n' "${iso_name}" "${iso_version}" >>"${_os_release}"
|
||||
fi
|
||||
|
||||
# Touch /usr/lib/clock-epoch to give another hint on date and time
|
||||
|
|
@ -1730,11 +1731,11 @@ _make_pkglist() {
|
|||
_msg_info "Creating a list of installed packages on live-enviroment..."
|
||||
case "${buildmode}" in
|
||||
"bootstrap")
|
||||
pacman -Q --sysroot "${pacstrap_dir}" > "${pacstrap_dir}/pkglist.${arch}.txt"
|
||||
pacman -Q --sysroot "${pacstrap_dir}" >"${pacstrap_dir}/pkglist.${arch}.txt"
|
||||
;;
|
||||
"iso"|"netboot")
|
||||
install -d -m 0755 -- "${isofs_dir}/${install_dir}"
|
||||
pacman -Q --sysroot "${pacstrap_dir}" > "${isofs_dir}/${install_dir}/pkglist.${arch}.txt"
|
||||
pacman -Q --sysroot "${pacstrap_dir}" >"${isofs_dir}/${install_dir}/pkglist.${arch}.txt"
|
||||
;;
|
||||
esac
|
||||
_msg_info "Done!"
|
||||
|
|
@ -1763,7 +1764,7 @@ _build_iso_base() {
|
|||
# Create working directory
|
||||
_run_once _make_work_dir
|
||||
# Write build date to file if it does not exist already
|
||||
[[ -e "${work_dir}/build_date" ]] || printf '%s\n' "$SOURCE_DATE_EPOCH" > "${work_dir}/build_date"
|
||||
[[ -e "${work_dir}/build_date" ]] || printf '%s\n' "$SOURCE_DATE_EPOCH" >"${work_dir}/build_date"
|
||||
|
||||
[[ "${quiet}" == "y" ]] || _show_config
|
||||
_run_once _make_pacman_conf
|
||||
|
|
@ -1848,15 +1849,15 @@ _build() {
|
|||
|
||||
while getopts 'c:p:C:L:P:A:D:w:m:o:g:G:vrh?' arg; do
|
||||
case "${arg}" in
|
||||
p) read -r -a override_pkg_list <<< "${OPTARG}" ;;
|
||||
p) read -r -a override_pkg_list <<<"${OPTARG}" ;;
|
||||
C) override_pacman_conf="${OPTARG}" ;;
|
||||
L) override_iso_label="${OPTARG}" ;;
|
||||
P) override_iso_publisher="${OPTARG}" ;;
|
||||
A) override_iso_application="${OPTARG}" ;;
|
||||
D) override_install_dir="${OPTARG}" ;;
|
||||
c) read -r -a override_cert_list <<< "${OPTARG}" ;;
|
||||
c) read -r -a override_cert_list <<<"${OPTARG}" ;;
|
||||
w) override_work_dir="${OPTARG}" ;;
|
||||
m) read -r -a override_buildmodes <<< "${OPTARG}" ;;
|
||||
m) read -r -a override_buildmodes <<<"${OPTARG}" ;;
|
||||
o) override_out_dir="${OPTARG}" ;;
|
||||
g) override_gpg_key="${OPTARG}" ;;
|
||||
G) override_gpg_sender="${OPTARG}" ;;
|
||||
|
|
|
|||
|
|
@ -1,17 +1,18 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
script_cmdline ()
|
||||
{
|
||||
script_cmdline() {
|
||||
local param
|
||||
for param in $(< /proc/cmdline); do
|
||||
for param in $(</proc/cmdline); do
|
||||
case "${param}" in
|
||||
script=*) echo "${param#*=}" ; return 0 ;;
|
||||
script=*)
|
||||
echo "${param#*=}"
|
||||
return 0
|
||||
;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
automated_script ()
|
||||
{
|
||||
automated_script() {
|
||||
local script rt
|
||||
script="$(script_cmdline)"
|
||||
if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then
|
||||
|
|
|
|||
|
|
@ -4,21 +4,22 @@
|
|||
|
||||
get_cmdline() {
|
||||
local param
|
||||
for param in $(< /proc/cmdline); do
|
||||
for param in $(</proc/cmdline); do
|
||||
case "${param}" in
|
||||
$1=*) echo "${param##*=}";
|
||||
"${1}="*)
|
||||
echo "${param##*=}"
|
||||
return 0
|
||||
;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
mirror=$(get_cmdline mirror)
|
||||
[[ $mirror = auto ]] && mirror=$(get_cmdline archiso_http_srv)
|
||||
[[ $mirror ]] || exit 0
|
||||
mirror="$(get_cmdline mirror)"
|
||||
[[ "$mirror" == 'auto' ]] && mirror="$(get_cmdline archiso_http_srv)"
|
||||
[[ -n "$mirror" ]] || exit 0
|
||||
|
||||
mv /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.orig
|
||||
cat >/etc/pacman.d/mirrorlist << EOF
|
||||
cat >/etc/pacman.d/mirrorlist <<EOF
|
||||
#
|
||||
# Arch Linux repository mirrorlist
|
||||
# Generated by archiso
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
usage() {
|
||||
cat <<- _EOF_
|
||||
cat <<-_EOF_
|
||||
live cd sound helper script.
|
||||
Usage: livecdsound [OPTION]
|
||||
OPTIONS
|
||||
|
|
@ -14,14 +14,13 @@ usage() {
|
|||
_EOF_
|
||||
}
|
||||
|
||||
bugout () {
|
||||
bugout() {
|
||||
printf "/usr/local/bin/livecdsound: programming error"
|
||||
stat_fail
|
||||
}
|
||||
|
||||
echo_card_indices()
|
||||
{
|
||||
if [ -f /proc/asound/cards ] ; then
|
||||
echo_card_indices() {
|
||||
if [[ -f /proc/asound/cards ]]; then
|
||||
sed -n -e's/^[[:space:]]*\([0-7]\)[[:space:]].*/\1/p' /proc/asound/cards
|
||||
fi
|
||||
}
|
||||
|
|
@ -33,8 +32,8 @@ echo_card_indices()
|
|||
# $1 <card id>
|
||||
# $2 <control>
|
||||
# $3 <level>
|
||||
unmute_and_set_level(){
|
||||
{ [ "$3" ] &&[ "$2" ] && [ "$1" ] ; } || bugout
|
||||
unmute_and_set_level() {
|
||||
[[ -n "$3" && -n "$2" && -n "$1" ]] || bugout
|
||||
systemd-cat -t "livecdsound" printf "Setting: %s on card: %s to %s\n" "$2" "$1" "$3"
|
||||
systemd-cat -t "livecdsound" amixer -c "$1" set "$2" "$3" unmute
|
||||
return 0
|
||||
|
|
@ -42,9 +41,8 @@ unmute_and_set_level(){
|
|||
|
||||
# $1 <card id>
|
||||
# $2 <control>
|
||||
mute_and_zero_level()
|
||||
{
|
||||
{ [ "$1" ] && [ "$2" ] ; } || bugout
|
||||
mute_and_zero_level() {
|
||||
[[ -n "$1" && -n "$2" ]] || bugout
|
||||
systemd-cat -t "livecdsound" printf "Muting control: %s on card: %s\n" "$2" "$1"
|
||||
systemd-cat -t "livecdsound" amixer -c "$1" set "$2" "0%" mute
|
||||
return 0
|
||||
|
|
@ -53,17 +51,15 @@ mute_and_zero_level()
|
|||
# $1 <card ID>
|
||||
# $2 <control>
|
||||
# $3 "on" | "off"
|
||||
switch_control()
|
||||
{
|
||||
{ [ "$3" ] && [ "$1" ] ; } || bugout
|
||||
switch_control() {
|
||||
[[ -n "$3" && -n "$1" ]] || bugout
|
||||
systemd-cat -t "livecdsound" printf "Switching control: %s on card: %s to %s\n" "$2" "$1" "$3"
|
||||
systemd-cat -t "livecdsound" amixer -c "$1" set "$2" "$3"
|
||||
return 0
|
||||
}
|
||||
|
||||
# $1 <card ID>
|
||||
sanify_levels_on_card()
|
||||
{
|
||||
sanify_levels_on_card() {
|
||||
unmute_and_set_level "$1" "Front" "80%"
|
||||
unmute_and_set_level "$1" "Master" "80%"
|
||||
unmute_and_set_level "$1" "Master Mono" "80%"
|
||||
|
|
@ -134,13 +130,12 @@ sanify_levels_on_card()
|
|||
}
|
||||
|
||||
# $1 <card ID> | "all"
|
||||
sanify_levels()
|
||||
{
|
||||
sanify_levels() {
|
||||
local ttsdml_returnstatus=0
|
||||
local card
|
||||
case "$1" in
|
||||
all)
|
||||
for card in $(echo_card_indices) ; do
|
||||
for card in $(echo_card_indices); do
|
||||
sanify_levels_on_card "$card" || ttsdml_returnstatus=1
|
||||
done
|
||||
;;
|
||||
|
|
@ -148,67 +143,63 @@ sanify_levels()
|
|||
sanify_levels_on_card "$1" || ttsdml_returnstatus=1
|
||||
;;
|
||||
esac
|
||||
return $ttsdml_returnstatus
|
||||
return "$ttsdml_returnstatus"
|
||||
}
|
||||
|
||||
# List all cards that *should* be usable for PCM audio. In my experience,
|
||||
# the console speaker (handled by the pcsp driver) isn't a suitable playback
|
||||
# device, so we'll exclude it.
|
||||
list_non_pcsp_cards()
|
||||
{
|
||||
list_non_pcsp_cards() {
|
||||
for card in $(echo_card_indices); do
|
||||
local cardfile="/proc/asound/card${card}/id"
|
||||
if [ -r "$cardfile" ] && [ -f "$cardfile" ] && \
|
||||
[ "$(cat "$cardfile")" != pcsp ]; then
|
||||
if [[ -r "$cardfile" && -f "$cardfile" && "$(cat "$cardfile")" != pcsp ]]; then
|
||||
echo "$card"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
# Properly initialize the sound card so that we have audio at boot.
|
||||
unmute_all_cards()
|
||||
{
|
||||
unmute_all_cards() {
|
||||
sanify_levels all
|
||||
}
|
||||
|
||||
is_numeric() {
|
||||
local str=$1
|
||||
local str="$1"
|
||||
[[ "$str" =~ ^[0-9]+$ ]]
|
||||
}
|
||||
|
||||
set_default_card() {
|
||||
local card=$1
|
||||
sed -e "s/%card%/$card/g" < /usr/local/share/livecd-sound/asound.conf.in \
|
||||
> /etc/asound.conf
|
||||
local card="$1"
|
||||
sed -e "s/%card%/$card/g" </usr/local/share/livecd-sound/asound.conf.in \
|
||||
>/etc/asound.conf
|
||||
}
|
||||
|
||||
play_on_card() {
|
||||
local card=$1 file=$2
|
||||
local card="$1" file="$2"
|
||||
aplay -q "-Dplughw:$card,0" "$file"
|
||||
}
|
||||
|
||||
# If there are multiple usable sound cards, prompt the user to choose one,
|
||||
# using auditory feedback.
|
||||
pick_a_card()
|
||||
{
|
||||
pick_a_card() {
|
||||
set -f
|
||||
usable_cards="$(list_non_pcsp_cards)"
|
||||
num_usable_cards="$(wc -w <<< "$usable_cards")"
|
||||
num_usable_cards="$(wc -w <<<"$usable_cards")"
|
||||
|
||||
if [ "$num_usable_cards" -eq 1 ]; then
|
||||
if (( num_usable_cards == 1 )); then
|
||||
systemd-cat -t "livecdsound" printf "Only one sound card is detected\n"
|
||||
exit 0
|
||||
fi
|
||||
systemd-cat -t "livecdsound" printf "multiple sound cards detected\n"
|
||||
for card in $usable_cards; do
|
||||
for card in "${usable_cards[@]}"; do
|
||||
if ! is_numeric "$card"; then
|
||||
continue
|
||||
fi
|
||||
play_on_card "$card" /usr/share/livecd-sounds/pick-a-card.wav&
|
||||
play_on_card "$card" /usr/share/livecd-sounds/pick-a-card.wav &
|
||||
done
|
||||
wait
|
||||
sleep 1
|
||||
for card in $usable_cards; do
|
||||
for card in "${usable_cards[@]}"; do
|
||||
if ! is_numeric "$card"; then
|
||||
continue
|
||||
fi
|
||||
|
|
@ -218,10 +209,10 @@ pick_a_card()
|
|||
set_default_card "$card"
|
||||
break
|
||||
fi
|
||||
done
|
||||
done
|
||||
}
|
||||
|
||||
if [[ $# -eq 0 ]]; then
|
||||
if (( $# == 0 )); then
|
||||
echo "error: No argument passed."
|
||||
exit 1
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
# - qemu
|
||||
# - edk2-ovmf (when UEFI booting)
|
||||
|
||||
|
||||
set -eu
|
||||
|
||||
print_help() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue