Introducing shellcheck in gitlab CI
archiso/mkarchiso: Quoting all variables. Changing pkg_list to be an array instead of a string for easier handling. Using read to properly populate pkg_list from OPTARG with stripped whitespaces. Not exporting iso_label anymore as there seems to be no reason to do so. Introducing line breaks. .editorconfig: Setting max_line_length to 120. Adding a section for YAML files (e.g. .gitlab-ci.yml). configs/releng/build.sh Quting nearly all variables. Introducing line breaks. configs/baseline/build.sh: Quoting all variables. Introducing line breaks. .gitlab-ci.yml: Adding gitlab CI for shelleck linting of the config build scripts, mkarchiso and startup scripts in releng. Closes #19
This commit is contained in:
parent
9e004aebf1
commit
47533fd974
@ -13,3 +13,12 @@ trim_trailing_whitespace = true
|
|||||||
charset = utf-8
|
charset = utf-8
|
||||||
indent_style = space
|
indent_style = space
|
||||||
indent_size = 4
|
indent_size = 4
|
||||||
|
max_line_length = 120
|
||||||
|
|
||||||
|
[*.{yml,yaml}]
|
||||||
|
end_of_line = lf
|
||||||
|
insert_final_newline = true
|
||||||
|
trim_trailing_whitespace = true
|
||||||
|
charset = utf-8
|
||||||
|
indent_style = space
|
||||||
|
indent_size = 2
|
||||||
|
15
.gitlab-ci.yml
Normal file
15
.gitlab-ci.yml
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
---
|
||||||
|
|
||||||
|
default:
|
||||||
|
image: archlinux/base
|
||||||
|
before_script:
|
||||||
|
- pacman --noconfirm -Syy
|
||||||
|
- pacman --noconfirm -S base-devel shellcheck
|
||||||
|
|
||||||
|
lint:
|
||||||
|
stage: build
|
||||||
|
script:
|
||||||
|
- shellcheck -s bash
|
||||||
|
archiso/mkarchiso
|
||||||
|
configs/{baseline,releng}/build.sh
|
||||||
|
configs/releng/airootfs/root/.automated_script.sh
|
@ -6,11 +6,11 @@ export LANG=C
|
|||||||
|
|
||||||
app_name=${0##*/}
|
app_name=${0##*/}
|
||||||
arch=$(uname -m)
|
arch=$(uname -m)
|
||||||
pkg_list=""
|
pkg_list=()
|
||||||
run_cmd=""
|
run_cmd=""
|
||||||
quiet="y"
|
quiet="y"
|
||||||
pacman_conf="/etc/pacman.conf"
|
pacman_conf="/etc/pacman.conf"
|
||||||
export iso_label="ARCH_$(date +%Y%m)"
|
iso_label="ARCH_$(date +%Y%m)"
|
||||||
iso_publisher="Arch Linux <http://www.archlinux.org>"
|
iso_publisher="Arch Linux <http://www.archlinux.org>"
|
||||||
iso_application="Arch Linux Live/Rescue CD"
|
iso_application="Arch Linux Live/Rescue CD"
|
||||||
install_dir="arch"
|
install_dir="arch"
|
||||||
@ -37,7 +37,7 @@ _msg_error() {
|
|||||||
echo "[mkarchiso] ERROR: ${_msg}"
|
echo "[mkarchiso] ERROR: ${_msg}"
|
||||||
echo
|
echo
|
||||||
if [[ ${_error} -gt 0 ]]; then
|
if [[ ${_error} -gt 0 ]]; then
|
||||||
exit ${_error}
|
exit "${_error}"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -110,7 +110,7 @@ _usage ()
|
|||||||
echo " make a pkglist.txt of packages installed on airootfs"
|
echo " make a pkglist.txt of packages installed on airootfs"
|
||||||
echo " iso <image name>"
|
echo " iso <image name>"
|
||||||
echo " build an iso image from the working dir"
|
echo " build an iso image from the working dir"
|
||||||
exit ${1}
|
exit "${1}"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Shows configuration according to command mode.
|
# Shows configuration according to command mode.
|
||||||
@ -129,7 +129,7 @@ _show_config () {
|
|||||||
;;
|
;;
|
||||||
install)
|
install)
|
||||||
_msg_info " Pacman config file: ${pacman_conf}"
|
_msg_info " Pacman config file: ${pacman_conf}"
|
||||||
_msg_info " Packages: ${pkg_list}"
|
_msg_info " Packages: ${pkg_list[*]}"
|
||||||
;;
|
;;
|
||||||
run)
|
run)
|
||||||
_msg_info " Run command: ${run_cmd}"
|
_msg_info " Run command: ${run_cmd}"
|
||||||
@ -154,9 +154,9 @@ _pacman ()
|
|||||||
_msg_info "Installing packages to '${work_dir}/airootfs/'..."
|
_msg_info "Installing packages to '${work_dir}/airootfs/'..."
|
||||||
|
|
||||||
if [[ "${quiet}" = "y" ]]; then
|
if [[ "${quiet}" = "y" ]]; then
|
||||||
pacstrap -C "${pacman_conf}" -c -G -M "${work_dir}/airootfs" $* &> /dev/null
|
pacstrap -C "${pacman_conf}" -c -G -M "${work_dir}/airootfs" "$@" &> /dev/null
|
||||||
else
|
else
|
||||||
pacstrap -C "${pacman_conf}" -c -G -M "${work_dir}/airootfs" $*
|
pacstrap -C "${pacman_conf}" -c -G -M "${work_dir}/airootfs" "$@"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
_msg_info "Packages installed successfully!"
|
_msg_info "Packages installed successfully!"
|
||||||
@ -208,7 +208,7 @@ _mkairootfs_img () {
|
|||||||
_msg_info "Creating ext4 image of 32GiB..."
|
_msg_info "Creating ext4 image of 32GiB..."
|
||||||
truncate -s 32G "${work_dir}/airootfs.img"
|
truncate -s 32G "${work_dir}/airootfs.img"
|
||||||
local _qflag=""
|
local _qflag=""
|
||||||
if [[ ${quiet} == "y" ]]; then
|
if [[ "${quiet}" == "y" ]]; then
|
||||||
_qflag="-q"
|
_qflag="-q"
|
||||||
fi
|
fi
|
||||||
mkfs.ext4 ${_qflag} -O ^has_journal,^resize_inode -E lazy_itable_init=0 -m 0 -F "${work_dir}/airootfs.img"
|
mkfs.ext4 ${_qflag} -O ^has_journal,^resize_inode -E lazy_itable_init=0 -m 0 -F "${work_dir}/airootfs.img"
|
||||||
@ -223,12 +223,14 @@ _mkairootfs_img () {
|
|||||||
mkdir -p "${work_dir}/iso/${install_dir}/${arch}"
|
mkdir -p "${work_dir}/iso/${install_dir}/${arch}"
|
||||||
_msg_info "Creating SquashFS image, this may take some time..."
|
_msg_info "Creating SquashFS image, this may take some time..."
|
||||||
if [[ "${quiet}" = "y" ]]; then
|
if [[ "${quiet}" = "y" ]]; then
|
||||||
mksquashfs "${work_dir}/airootfs.img" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend -comp "${sfs_comp}" -no-progress &> /dev/null
|
mksquashfs "${work_dir}/airootfs.img" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \
|
||||||
|
-comp "${sfs_comp}" -no-progress &> /dev/null
|
||||||
else
|
else
|
||||||
mksquashfs "${work_dir}/airootfs.img" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend -comp "${sfs_comp}" -no-progress
|
mksquashfs "${work_dir}/airootfs.img" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \
|
||||||
|
-comp "${sfs_comp}" -no-progress
|
||||||
fi
|
fi
|
||||||
_msg_info "Done!"
|
_msg_info "Done!"
|
||||||
rm ${work_dir}/airootfs.img
|
rm "${work_dir}/airootfs.img"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Makes a SquashFS filesystem from a source directory.
|
# Makes a SquashFS filesystem from a source directory.
|
||||||
@ -240,9 +242,11 @@ _mkairootfs_sfs () {
|
|||||||
mkdir -p "${work_dir}/iso/${install_dir}/${arch}"
|
mkdir -p "${work_dir}/iso/${install_dir}/${arch}"
|
||||||
_msg_info "Creating SquashFS image, this may take some time..."
|
_msg_info "Creating SquashFS image, this may take some time..."
|
||||||
if [[ "${quiet}" = "y" ]]; then
|
if [[ "${quiet}" = "y" ]]; then
|
||||||
mksquashfs "${work_dir}/airootfs" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend -comp "${sfs_comp}" -no-progress &> /dev/null
|
mksquashfs "${work_dir}/airootfs" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \
|
||||||
|
-comp "${sfs_comp}" -no-progress &> /dev/null
|
||||||
else
|
else
|
||||||
mksquashfs "${work_dir}/airootfs" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend -comp "${sfs_comp}" -no-progress
|
mksquashfs "${work_dir}/airootfs" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \
|
||||||
|
-comp "${sfs_comp}" -no-progress
|
||||||
fi
|
fi
|
||||||
_msg_info "Done!"
|
_msg_info "Done!"
|
||||||
}
|
}
|
||||||
@ -251,15 +255,15 @@ _mkchecksum () {
|
|||||||
_msg_info "Creating checksum file for self-test..."
|
_msg_info "Creating checksum file for self-test..."
|
||||||
cd "${work_dir}/iso/${install_dir}/${arch}"
|
cd "${work_dir}/iso/${install_dir}/${arch}"
|
||||||
sha512sum airootfs.sfs > airootfs.sha512
|
sha512sum airootfs.sfs > airootfs.sha512
|
||||||
cd ${OLDPWD}
|
cd "${OLDPWD}"
|
||||||
_msg_info "Done!"
|
_msg_info "Done!"
|
||||||
}
|
}
|
||||||
|
|
||||||
_mksignature () {
|
_mksignature () {
|
||||||
_msg_info "Creating signature file..."
|
_msg_info "Creating signature file..."
|
||||||
cd "${work_dir}/iso/${install_dir}/${arch}"
|
cd "${work_dir}/iso/${install_dir}/${arch}"
|
||||||
gpg --detach-sign --default-key ${gpg_key} airootfs.sfs
|
gpg --detach-sign --default-key "${gpg_key}" airootfs.sfs
|
||||||
cd ${OLDPWD}
|
cd "${OLDPWD}"
|
||||||
_msg_info "Done!"
|
_msg_info "Done!"
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -294,13 +298,13 @@ command_iso () {
|
|||||||
|
|
||||||
_show_config iso
|
_show_config iso
|
||||||
|
|
||||||
mkdir -p ${out_dir}
|
mkdir -p "${out_dir}"
|
||||||
_msg_info "Creating ISO image..."
|
_msg_info "Creating ISO image..."
|
||||||
local _qflag=""
|
local _qflag=""
|
||||||
if [[ ${quiet} == "y" ]]; then
|
if [[ "${quiet}" == "y" ]]; then
|
||||||
_qflag="-quiet"
|
_qflag="-quiet"
|
||||||
fi
|
fi
|
||||||
xorriso -as mkisofs ${_qflag} \
|
xorriso -as mkisofs "${_qflag}" \
|
||||||
-iso-level 3 \
|
-iso-level 3 \
|
||||||
-full-iso9660-filenames \
|
-full-iso9660-filenames \
|
||||||
-volid "${iso_label}" \
|
-volid "${iso_label}" \
|
||||||
@ -310,11 +314,11 @@ command_iso () {
|
|||||||
-eltorito-boot isolinux/isolinux.bin \
|
-eltorito-boot isolinux/isolinux.bin \
|
||||||
-eltorito-catalog isolinux/boot.cat \
|
-eltorito-catalog isolinux/boot.cat \
|
||||||
-no-emul-boot -boot-load-size 4 -boot-info-table \
|
-no-emul-boot -boot-load-size 4 -boot-info-table \
|
||||||
-isohybrid-mbr ${work_dir}/iso/isolinux/isohdpfx.bin \
|
-isohybrid-mbr "${work_dir}/iso/isolinux/isohdpfx.bin" \
|
||||||
${_iso_efi_boot_args} \
|
"${_iso_efi_boot_args}" \
|
||||||
-output "${out_dir}/${img_name}" \
|
-output "${out_dir}/${img_name}" \
|
||||||
"${work_dir}/iso/"
|
"${work_dir}/iso/"
|
||||||
_msg_info "Done! | $(ls -sh ${out_dir}/${img_name})"
|
_msg_info "Done! | $(ls -sh "${out_dir}/${img_name}")"
|
||||||
}
|
}
|
||||||
|
|
||||||
# create airootfs.sfs filesystem, and push it in "iso" directory.
|
# create airootfs.sfs filesystem, and push it in "iso" directory.
|
||||||
@ -322,13 +326,13 @@ command_prepare () {
|
|||||||
_show_config prepare
|
_show_config prepare
|
||||||
|
|
||||||
_cleanup
|
_cleanup
|
||||||
if [[ ${sfs_mode} == "sfs" ]]; then
|
if [[ "${sfs_mode}" == "sfs" ]]; then
|
||||||
_mkairootfs_sfs
|
_mkairootfs_sfs
|
||||||
else
|
else
|
||||||
_mkairootfs_img
|
_mkairootfs_img
|
||||||
fi
|
fi
|
||||||
_mkchecksum
|
_mkchecksum
|
||||||
if [[ ${gpg_key} ]]; then
|
if [[ "${gpg_key}" ]]; then
|
||||||
_mksignature
|
_mksignature
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
@ -340,17 +344,14 @@ command_install () {
|
|||||||
_msg_error "Pacman config file '${pacman_conf}' does not exist" 1
|
_msg_error "Pacman config file '${pacman_conf}' does not exist" 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#trim spaces
|
if [[ "${#pkg_list[@]}" -eq 0 ]]; then
|
||||||
pkg_list="$(echo ${pkg_list})"
|
|
||||||
|
|
||||||
if [[ -z ${pkg_list} ]]; then
|
|
||||||
_msg_error "Packages must be specified" 0
|
_msg_error "Packages must be specified" 0
|
||||||
_usage 1
|
_usage 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
_show_config install
|
_show_config install
|
||||||
|
|
||||||
_pacman "${pkg_list}"
|
_pacman "${pkg_list[*]}"
|
||||||
}
|
}
|
||||||
|
|
||||||
command_init() {
|
command_init() {
|
||||||
@ -363,7 +364,7 @@ command_run() {
|
|||||||
_chroot_run
|
_chroot_run
|
||||||
}
|
}
|
||||||
|
|
||||||
if [[ ${EUID} -ne 0 ]]; then
|
if [[ "${EUID}" -ne 0 ]]; then
|
||||||
_msg_error "This script must be run as root." 1
|
_msg_error "This script must be run as root." 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -371,7 +372,9 @@ umask 0022
|
|||||||
|
|
||||||
while getopts 'p:r:C:L:P:A:D:w:o:s:c:g:vh' arg; do
|
while getopts 'p:r:C:L:P:A:D:w:o:s:c:g:vh' arg; do
|
||||||
case "${arg}" in
|
case "${arg}" in
|
||||||
p) pkg_list="${pkg_list} ${OPTARG}" ;;
|
p)
|
||||||
|
read -r -a opt_pkg_list <<< "${OPTARG}"
|
||||||
|
pkg_list+=("${opt_pkg_list[@]}") ;;
|
||||||
r) run_cmd="${OPTARG}" ;;
|
r) run_cmd="${OPTARG}" ;;
|
||||||
C) pacman_conf="${OPTARG}" ;;
|
C) pacman_conf="${OPTARG}" ;;
|
||||||
L) iso_label="${OPTARG}" ;;
|
L) iso_label="${OPTARG}" ;;
|
||||||
|
@ -10,15 +10,15 @@ arch=$(uname -m)
|
|||||||
work_dir=work
|
work_dir=work
|
||||||
out_dir=out
|
out_dir=out
|
||||||
|
|
||||||
script_path=$(readlink -f ${0%/*})
|
script_path=$(readlink -f "${0%/*}")
|
||||||
|
|
||||||
umask 0022
|
umask 0022
|
||||||
|
|
||||||
# Helper function to run make_*() only one time per architecture.
|
# Helper function to run make_*() only one time per architecture.
|
||||||
run_once() {
|
run_once() {
|
||||||
if [[ ! -e ${work_dir}/build.${1}_${arch} ]]; then
|
if [[ ! -e "${work_dir}/build.${1}_${arch}" ]]; then
|
||||||
$1
|
"$1"
|
||||||
touch ${work_dir}/build.${1}_${arch}
|
touch "${work_dir}/build.${1}_${arch}"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -29,39 +29,42 @@ make_basefs() {
|
|||||||
|
|
||||||
# Copy mkinitcpio archiso hooks and build initramfs (airootfs)
|
# Copy mkinitcpio archiso hooks and build initramfs (airootfs)
|
||||||
make_setup_mkinitcpio() {
|
make_setup_mkinitcpio() {
|
||||||
mkdir -p ${work_dir}/airootfs/etc/initcpio/hooks
|
mkdir -p "${work_dir}/airootfs/etc/initcpio/hooks"
|
||||||
mkdir -p ${work_dir}/airootfs/etc/initcpio/install
|
mkdir -p "${work_dir}/airootfs/etc/initcpio/install"
|
||||||
cp /usr/lib/initcpio/hooks/archiso ${work_dir}/airootfs/etc/initcpio/hooks
|
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 /usr/lib/initcpio/install/archiso "${work_dir}/airootfs/etc/initcpio/install"
|
||||||
cp ${script_path}/mkinitcpio.conf ${work_dir}/airootfs/etc/mkinitcpio-archiso.conf
|
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
|
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/
|
# Prepare ${install_dir}/boot/
|
||||||
make_boot() {
|
make_boot() {
|
||||||
mkdir -p ${work_dir}/iso/${install_dir}/boot/${arch}
|
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/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}/vmlinuz"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Prepare /${install_dir}/boot/syslinux
|
# Prepare /${install_dir}/boot/syslinux
|
||||||
make_syslinux() {
|
make_syslinux() {
|
||||||
mkdir -p ${work_dir}/iso/${install_dir}/boot/syslinux
|
mkdir -p "${work_dir}/iso/${install_dir}/boot/syslinux"
|
||||||
sed "s|%ARCHISO_LABEL%|${iso_label}|g;
|
sed "s|%ARCHISO_LABEL%|${iso_label}|g;
|
||||||
s|%INSTALL_DIR%|${install_dir}|g;
|
s|%INSTALL_DIR%|${install_dir}|g;
|
||||||
s|%ARCH%|${arch}|g" ${script_path}/syslinux/syslinux.cfg > ${work_dir}/iso/${install_dir}/boot/syslinux/syslinux.cfg
|
s|%ARCH%|${arch}|g" "${script_path}/syslinux/syslinux.cfg" > \
|
||||||
cp ${work_dir}/airootfs/usr/lib/syslinux/bios/ldlinux.c32 ${work_dir}/iso/${install_dir}/boot/syslinux/
|
"${work_dir}/iso/${install_dir}/boot/syslinux/syslinux.cfg"
|
||||||
cp ${work_dir}/airootfs/usr/lib/syslinux/bios/menu.c32 ${work_dir}/iso/${install_dir}/boot/syslinux/
|
cp "${work_dir}/airootfs/usr/lib/syslinux/bios/ldlinux.c32" "${work_dir}/iso/${install_dir}/boot/syslinux/"
|
||||||
cp ${work_dir}/airootfs/usr/lib/syslinux/bios/libutil.c32 ${work_dir}/iso/${install_dir}/boot/syslinux/
|
cp "${work_dir}/airootfs/usr/lib/syslinux/bios/menu.c32" "${work_dir}/iso/${install_dir}/boot/syslinux/"
|
||||||
|
cp "${work_dir}/airootfs/usr/lib/syslinux/bios/libutil.c32" "${work_dir}/iso/${install_dir}/boot/syslinux/"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Prepare /isolinux
|
# Prepare /isolinux
|
||||||
make_isolinux() {
|
make_isolinux() {
|
||||||
mkdir -p ${work_dir}/iso/isolinux
|
mkdir -p "${work_dir}/iso/isolinux"
|
||||||
sed "s|%INSTALL_DIR%|${install_dir}|g" ${script_path}/isolinux/isolinux.cfg > ${work_dir}/iso/isolinux/isolinux.cfg
|
sed "s|%INSTALL_DIR%|${install_dir}|g" "${script_path}/isolinux/isolinux.cfg" > \
|
||||||
cp ${work_dir}/airootfs/usr/lib/syslinux/bios/isolinux.bin ${work_dir}/iso/isolinux/
|
"${work_dir}/iso/isolinux/isolinux.cfg"
|
||||||
cp ${work_dir}/airootfs/usr/lib/syslinux/bios/isohdpfx.bin ${work_dir}/iso/isolinux/
|
cp "${work_dir}/airootfs/usr/lib/syslinux/bios/isolinux.bin" "${work_dir}/iso/isolinux/"
|
||||||
cp ${work_dir}/airootfs/usr/lib/syslinux/bios/ldlinux.c32 ${work_dir}/iso/isolinux/
|
cp "${work_dir}/airootfs/usr/lib/syslinux/bios/isohdpfx.bin" "${work_dir}/iso/isolinux/"
|
||||||
|
cp "${work_dir}/airootfs/usr/lib/syslinux/bios/ldlinux.c32" "${work_dir}/iso/isolinux/"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Build airootfs filesystem image
|
# Build airootfs filesystem image
|
||||||
@ -71,7 +74,8 @@ make_prepare() {
|
|||||||
|
|
||||||
# Build ISO
|
# Build ISO
|
||||||
make_iso() {
|
make_iso() {
|
||||||
mkarchiso -v -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-${arch}.iso"
|
mkarchiso -v -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso \
|
||||||
|
"${iso_name}-${iso_version}-${arch}.iso"
|
||||||
}
|
}
|
||||||
|
|
||||||
run_once make_basefs
|
run_once make_basefs
|
||||||
|
@ -10,10 +10,10 @@ iso_version=$(date +%Y.%m.%d)
|
|||||||
install_dir=arch
|
install_dir=arch
|
||||||
work_dir=work
|
work_dir=work
|
||||||
out_dir=out
|
out_dir=out
|
||||||
gpg_key=
|
gpg_key=""
|
||||||
|
|
||||||
verbose=""
|
verbose=""
|
||||||
script_path=$(readlink -f ${0%/*})
|
script_path=$(readlink -f "${0%/*}")
|
||||||
|
|
||||||
umask 0022
|
umask 0022
|
||||||
|
|
||||||
@ -40,177 +40,227 @@ _usage ()
|
|||||||
echo " Default: ${out_dir}"
|
echo " Default: ${out_dir}"
|
||||||
echo " -v Enable verbose output"
|
echo " -v Enable verbose output"
|
||||||
echo " -h This help message"
|
echo " -h This help message"
|
||||||
exit ${1}
|
exit "${1}"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Helper function to run make_*() only one time per architecture.
|
# Helper function to run make_*() only one time per architecture.
|
||||||
run_once() {
|
run_once() {
|
||||||
if [[ ! -e ${work_dir}/build.${1} ]]; then
|
if [[ ! -e "${work_dir}/build.${1}" ]]; then
|
||||||
$1
|
"$1"
|
||||||
touch ${work_dir}/build.${1}
|
touch "${work_dir}/build.${1}"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Setup custom pacman.conf with current cache directories.
|
# Setup custom pacman.conf with current cache directories.
|
||||||
make_pacman_conf() {
|
make_pacman_conf() {
|
||||||
local _cache_dirs
|
local _cache_dirs
|
||||||
_cache_dirs=($(pacman -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g'))
|
_cache_dirs=("$(pacman -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g')")
|
||||||
sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n ${_cache_dirs[@]})|g" ${script_path}/pacman.conf > ${work_dir}/pacman.conf
|
sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n "${_cache_dirs[@]}")|g" \
|
||||||
|
"${script_path}/pacman.conf" > "${work_dir}/pacman.conf"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Base installation, plus needed packages (airootfs)
|
# Base installation, plus needed packages (airootfs)
|
||||||
make_basefs() {
|
make_basefs() {
|
||||||
mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" init
|
if [ -n "${verbose}" ]; then
|
||||||
mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "haveged intel-ucode amd-ucode memtest86+ mkinitcpio-nfs-utils nbd zsh" install
|
mkarchiso -v -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" init
|
||||||
|
mkarchiso -v -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
|
||||||
|
-p "haveged intel-ucode amd-ucode memtest86+ mkinitcpio-nfs-utils nbd zsh" install
|
||||||
|
else
|
||||||
|
mkarchiso -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" init
|
||||||
|
mkarchiso -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
|
||||||
|
-p "haveged intel-ucode amd-ucode memtest86+ mkinitcpio-nfs-utils nbd zsh" install
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Additional packages (airootfs)
|
# Additional packages (airootfs)
|
||||||
make_packages() {
|
make_packages() {
|
||||||
mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -p "$(grep -h -v ^# ${script_path}/packages.x86_64)" install
|
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")" 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")" install
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Copy mkinitcpio archiso hooks and build initramfs (airootfs)
|
# Copy mkinitcpio archiso hooks and build initramfs (airootfs)
|
||||||
make_setup_mkinitcpio() {
|
make_setup_mkinitcpio() {
|
||||||
local _hook
|
local _hook
|
||||||
mkdir -p ${work_dir}/x86_64/airootfs/etc/initcpio/hooks
|
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/install"
|
||||||
for _hook in archiso archiso_shutdown archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_loop_mnt; do
|
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/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/install/${_hook}" "${work_dir}/x86_64/airootfs/etc/initcpio/install"
|
||||||
done
|
done
|
||||||
sed -i "s|/usr/lib/initcpio/|/etc/initcpio/|g" ${work_dir}/x86_64/airootfs/etc/initcpio/install/archiso_shutdown
|
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/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 /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 "${script_path}/mkinitcpio.conf" "${work_dir}/x86_64/airootfs/etc/mkinitcpio-archiso.conf"
|
||||||
gnupg_fd=
|
if [[ "${gpg_key}" ]]; then
|
||||||
if [[ ${gpg_key} ]]; then
|
gpg --export "${gpg_key}" > "${work_dir}/gpgkey"
|
||||||
gpg --export ${gpg_key} >${work_dir}/gpgkey
|
exec 17<>"${work_dir}/gpgkey"
|
||||||
exec 17<>${work_dir}/gpgkey
|
|
||||||
fi
|
fi
|
||||||
ARCHISO_GNUPG_FD=${gpg_key:+17} mkarchiso ${verbose} -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
|
if [ -n "${verbose}" ]; then
|
||||||
if [[ ${gpg_key} ]]; 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
|
||||||
|
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
|
||||||
|
fi
|
||||||
|
if [[ "${gpg_key}" ]]; then
|
||||||
exec 17<&-
|
exec 17<&-
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Customize installation (airootfs)
|
# Customize installation (airootfs)
|
||||||
make_customize_airootfs() {
|
make_customize_airootfs() {
|
||||||
cp -af --no-preserve=ownership ${script_path}/airootfs ${work_dir}/x86_64
|
cp -af --no-preserve=ownership "${script_path}/airootfs" "${work_dir}/x86_64"
|
||||||
|
|
||||||
cp ${script_path}/pacman.conf ${work_dir}/x86_64/airootfs/etc
|
cp "${script_path}/pacman.conf" "${work_dir}/x86_64/airootfs/etc"
|
||||||
|
|
||||||
curl -o ${work_dir}/x86_64/airootfs/etc/pacman.d/mirrorlist 'https://www.archlinux.org/mirrorlist/?country=all&protocol=http&use_mirror_status=on'
|
curl -o "${work_dir}/x86_64/airootfs/etc/pacman.d/mirrorlist" \
|
||||||
|
'https://www.archlinux.org/mirrorlist/?country=all&protocol=http&use_mirror_status=on'
|
||||||
|
|
||||||
lynx -dump -nolist 'https://wiki.archlinux.org/index.php/Installation_Guide?action=render' >> ${work_dir}/x86_64/airootfs/root/install.txt
|
lynx -dump -nolist 'https://wiki.archlinux.org/index.php/Installation_Guide?action=render' >> \
|
||||||
|
"${work_dir}/x86_64/airootfs/root/install.txt"
|
||||||
|
|
||||||
mkarchiso ${verbose} -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" -r '/root/customize_airootfs.sh' run
|
if [ -n "${verbose}" ]; then
|
||||||
rm ${work_dir}/x86_64/airootfs/root/customize_airootfs.sh
|
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"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Prepare kernel/initramfs ${install_dir}/boot/
|
# Prepare kernel/initramfs ${install_dir}/boot/
|
||||||
make_boot() {
|
make_boot() {
|
||||||
mkdir -p ${work_dir}/iso/${install_dir}/boot/x86_64
|
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/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/vmlinuz-linux" "${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Add other aditional/extra files to ${install_dir}/boot/
|
# Add other aditional/extra files to ${install_dir}/boot/
|
||||||
make_boot_extra() {
|
make_boot_extra() {
|
||||||
cp ${work_dir}/x86_64/airootfs/boot/memtest86+/memtest.bin ${work_dir}/iso/${install_dir}/boot/memtest
|
cp "${work_dir}/x86_64/airootfs/boot/memtest86+/memtest.bin" "${work_dir}/iso/${install_dir}/boot/memtest"
|
||||||
cp ${work_dir}/x86_64/airootfs/usr/share/licenses/common/GPL2/license.txt ${work_dir}/iso/${install_dir}/boot/memtest.COPYING
|
cp "${work_dir}/x86_64/airootfs/usr/share/licenses/common/GPL2/license.txt" \
|
||||||
cp ${work_dir}/x86_64/airootfs/boot/intel-ucode.img ${work_dir}/iso/${install_dir}/boot/intel_ucode.img
|
"${work_dir}/iso/${install_dir}/boot/memtest.COPYING"
|
||||||
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/intel_ucode.img"
|
||||||
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/intel-ucode/LICENSE" \
|
||||||
cp ${work_dir}/x86_64/airootfs/usr/share/licenses/amd-ucode/LICENSE ${work_dir}/iso/${install_dir}/boot/amd_ucode.LICENSE
|
"${work_dir}/iso/${install_dir}/boot/intel_ucode.LICENSE"
|
||||||
|
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"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Prepare /${install_dir}/boot/syslinux
|
# Prepare /${install_dir}/boot/syslinux
|
||||||
make_syslinux() {
|
make_syslinux() {
|
||||||
_uname_r=$(file -b ${work_dir}/x86_64/airootfs/boot/vmlinuz-linux| awk 'f{print;f=0} /version/{f=1}' RS=' ')
|
_uname_r=$(file -b "${work_dir}/x86_64/airootfs/boot/vmlinuz-linux"| awk 'f{print;f=0} /version/{f=1}' RS=' ')
|
||||||
mkdir -p ${work_dir}/iso/${install_dir}/boot/syslinux
|
mkdir -p "${work_dir}/iso/${install_dir}/boot/syslinux"
|
||||||
for _cfg in ${script_path}/syslinux/*.cfg; do
|
for _cfg in "${script_path}/syslinux/"*.cfg; do
|
||||||
sed "s|%ARCHISO_LABEL%|${iso_label}|g;
|
sed "s|%ARCHISO_LABEL%|${iso_label}|g;
|
||||||
s|%INSTALL_DIR%|${install_dir}|g" ${_cfg} > ${work_dir}/iso/${install_dir}/boot/syslinux/${_cfg##*/}
|
s|%INSTALL_DIR%|${install_dir}|g" "${_cfg}" > "${work_dir}/iso/${install_dir}/boot/syslinux/${_cfg##*/}"
|
||||||
done
|
done
|
||||||
cp ${script_path}/syslinux/splash.png ${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/"*.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/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 "${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
|
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
|
gzip -c -9 "${work_dir}/x86_64/airootfs/usr/share/hwdata/pci.ids" > \
|
||||||
gzip -c -9 ${work_dir}/x86_64/airootfs/usr/lib/modules/${_uname_r}/modules.alias > ${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz
|
"${work_dir}/iso/${install_dir}/boot/syslinux/hdt/pciids.gz"
|
||||||
|
gzip -c -9 "${work_dir}/x86_64/airootfs/usr/lib/modules/${_uname_r}/modules.alias" > \
|
||||||
|
"${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Prepare /isolinux
|
# Prepare /isolinux
|
||||||
make_isolinux() {
|
make_isolinux() {
|
||||||
mkdir -p ${work_dir}/iso/isolinux
|
mkdir -p "${work_dir}/iso/isolinux"
|
||||||
sed "s|%INSTALL_DIR%|${install_dir}|g" ${script_path}/isolinux/isolinux.cfg > ${work_dir}/iso/isolinux/isolinux.cfg
|
sed "s|%INSTALL_DIR%|${install_dir}|g" \
|
||||||
cp ${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/isolinux.bin ${work_dir}/iso/isolinux/
|
"${script_path}/isolinux/isolinux.cfg" > "${work_dir}/iso/isolinux/isolinux.cfg"
|
||||||
cp ${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/isohdpfx.bin ${work_dir}/iso/isolinux/
|
cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/isolinux.bin" "${work_dir}/iso/isolinux/"
|
||||||
cp ${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/ldlinux.c32 ${work_dir}/iso/isolinux/
|
cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/isohdpfx.bin" "${work_dir}/iso/isolinux/"
|
||||||
|
cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/ldlinux.c32" "${work_dir}/iso/isolinux/"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Prepare /EFI
|
# Prepare /EFI
|
||||||
make_efi() {
|
make_efi() {
|
||||||
mkdir -p ${work_dir}/iso/EFI/boot
|
mkdir -p "${work_dir}/iso/EFI/boot"
|
||||||
cp ${work_dir}/x86_64/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi ${work_dir}/iso/EFI/boot/bootx64.efi
|
cp "${work_dir}/x86_64/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
|
||||||
|
"${work_dir}/iso/EFI/boot/bootx64.efi"
|
||||||
|
|
||||||
mkdir -p ${work_dir}/iso/loader/entries
|
mkdir -p "${work_dir}/iso/loader/entries"
|
||||||
cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/iso/loader/
|
cp "${script_path}/efiboot/loader/loader.conf" "${work_dir}/iso/loader/"
|
||||||
|
|
||||||
sed "s|%ARCHISO_LABEL%|${iso_label}|g;
|
sed "s|%ARCHISO_LABEL%|${iso_label}|g;
|
||||||
s|%INSTALL_DIR%|${install_dir}|g" \
|
s|%INSTALL_DIR%|${install_dir}|g" \
|
||||||
${script_path}/efiboot/loader/entries/archiso-x86_64-usb.conf > ${work_dir}/iso/loader/entries/archiso-x86_64.conf
|
"${script_path}/efiboot/loader/entries/archiso-x86_64-usb.conf" > \
|
||||||
|
"${work_dir}/iso/loader/entries/archiso-x86_64.conf"
|
||||||
|
|
||||||
# edk2-shell based UEFI shell
|
# edk2-shell based UEFI shell
|
||||||
# shellx64.efi is picked up automatically when on /
|
# shellx64.efi is picked up automatically when on /
|
||||||
cp /usr/share/edk2-shell/x64/Shell_Full.efi ${work_dir}/iso/shellx64.efi
|
cp /usr/share/edk2-shell/x64/Shell_Full.efi "${work_dir}/iso/shellx64.efi"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
|
# Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
|
||||||
make_efiboot() {
|
make_efiboot() {
|
||||||
mkdir -p ${work_dir}/iso/EFI/archiso
|
mkdir -p "${work_dir}/iso/EFI/archiso"
|
||||||
truncate -s 64M ${work_dir}/iso/EFI/archiso/efiboot.img
|
truncate -s 64M "${work_dir}/iso/EFI/archiso/efiboot.img"
|
||||||
mkfs.fat -n ARCHISO_EFI ${work_dir}/iso/EFI/archiso/efiboot.img
|
mkfs.fat -n ARCHISO_EFI "${work_dir}/iso/EFI/archiso/efiboot.img"
|
||||||
|
|
||||||
mkdir -p ${work_dir}/efiboot
|
mkdir -p "${work_dir}/efiboot"
|
||||||
mount ${work_dir}/iso/EFI/archiso/efiboot.img ${work_dir}/efiboot
|
mount "${work_dir}/iso/EFI/archiso/efiboot.img" "${work_dir}/efiboot"
|
||||||
|
|
||||||
mkdir -p ${work_dir}/efiboot/EFI/archiso
|
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/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/archiso.img" "${work_dir}/efiboot/EFI/archiso/archiso.img"
|
||||||
|
|
||||||
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/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/amd_ucode.img" "${work_dir}/efiboot/EFI/archiso/amd_ucode.img"
|
||||||
|
|
||||||
mkdir -p ${work_dir}/efiboot/EFI/boot
|
mkdir -p "${work_dir}/efiboot/EFI/boot"
|
||||||
cp ${work_dir}/x86_64/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi ${work_dir}/efiboot/EFI/boot/bootx64.efi
|
cp "${work_dir}/x86_64/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
|
||||||
|
"${work_dir}/efiboot/EFI/boot/bootx64.efi"
|
||||||
|
|
||||||
mkdir -p ${work_dir}/efiboot/loader/entries
|
mkdir -p "${work_dir}/efiboot/loader/entries"
|
||||||
cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/efiboot/loader/
|
cp "${script_path}/efiboot/loader/loader.conf" "${work_dir}/efiboot/loader/"
|
||||||
|
|
||||||
sed "s|%ARCHISO_LABEL%|${iso_label}|g;
|
sed "s|%ARCHISO_LABEL%|${iso_label}|g;
|
||||||
s|%INSTALL_DIR%|${install_dir}|g" \
|
s|%INSTALL_DIR%|${install_dir}|g" \
|
||||||
${script_path}/efiboot/loader/entries/archiso-x86_64-cd.conf > ${work_dir}/efiboot/loader/entries/archiso-x86_64.conf
|
"${script_path}/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 /
|
# shellx64.efi is picked up automatically when on /
|
||||||
cp ${work_dir}/iso/shellx64.efi ${work_dir}/efiboot/
|
cp "${work_dir}/iso/shellx64.efi" "${work_dir}/efiboot/"
|
||||||
|
|
||||||
umount -d ${work_dir}/efiboot
|
umount -d "${work_dir}/efiboot"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Build airootfs filesystem image
|
# Build airootfs filesystem image
|
||||||
make_prepare() {
|
make_prepare() {
|
||||||
cp -a -l -f ${work_dir}/x86_64/airootfs ${work_dir}
|
cp -a -l -f "${work_dir}/x86_64/airootfs" "${work_dir}"
|
||||||
mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" pkglist
|
if [ -n "${verbose}" ]; then
|
||||||
mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} prepare
|
mkarchiso -v -w "${work_dir}" -D "${install_dir}" pkglist
|
||||||
rm -rf ${work_dir}/airootfs
|
mkarchiso -v -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} prepare
|
||||||
# rm -rf ${work_dir}/x86_64/airootfs (if low space, this helps)
|
else
|
||||||
|
mkarchiso -w "${work_dir}" -D "${install_dir}" pkglist
|
||||||
|
mkarchiso -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} prepare
|
||||||
|
fi
|
||||||
|
rm -rf "${work_dir}/airootfs"
|
||||||
|
# rm -rf "${work_dir}/x86_64/airootfs" (if low space, this helps)
|
||||||
}
|
}
|
||||||
|
|
||||||
# Build ISO
|
# Build ISO
|
||||||
make_iso() {
|
make_iso() {
|
||||||
mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" -A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-x86_64.iso"
|
if [ -n "${verbose}" ]; then
|
||||||
|
mkarchiso -v -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" \
|
||||||
|
-A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-x86_64.iso"
|
||||||
|
else
|
||||||
|
mkarchiso -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" \
|
||||||
|
-A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-x86_64.iso"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
if [[ ${EUID} -ne 0 ]]; then
|
if [[ ${EUID} -ne 0 ]]; then
|
||||||
@ -238,7 +288,7 @@ while getopts 'N:V:L:P:A:D:w:o:g:vh' arg; do
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
mkdir -p ${work_dir}
|
mkdir -p "${work_dir}"
|
||||||
|
|
||||||
run_once make_pacman_conf
|
run_once make_pacman_conf
|
||||||
run_once make_basefs
|
run_once make_basefs
|
||||||
|
Loading…
Reference in New Issue
Block a user