diff options
| author | nl6720 <nl6720@gmail.com> | 2020-07-28 11:50:25 +0300 |
|---|---|---|
| committer | nl6720 <nl6720@gmail.com> | 2020-07-28 11:50:25 +0300 |
| commit | df93289b73c87f290a884ea6fa955a49cc0f8a9d (patch) | |
| tree | 761acf681ad96a2e8e1e990e19ca9ea11010123a /configs/releng | |
| parent | c54a41fb3db67e9ec1c614476193e905e2ebafdc (diff) | |
| download | archiso32-df93289b73c87f290a884ea6fa955a49cc0f8a9d.tar.xz | |
Install all packages in one go and don't copy pacman.conf to airootfs
configs/{baseline,releng}/build.sh:
Copy custom files to airootfs before installing packages.
Instead of calling `mkarchiso init`, list all required packages in packages.x86_64 and install them all at once with `mkarchiso install`. The mkdir command which `mkarchiso init` performs is now done by make_custom_airootfs.
configs/releng/build.sh:
Don't copy configs/releng/pacman.conf to airootfs, it is only meant to provide a unmodified pacman.conf durring pacstrap. In airootfs, an unmodified /etc/pacman.conf will be installed with the pacman package.
Diffstat (limited to 'configs/releng')
| -rwxr-xr-x | configs/releng/build.sh | 26 | ||||
| -rw-r--r-- | configs/releng/packages.x86_64 | 2 |
2 files changed, 14 insertions, 14 deletions
diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 327a193..23cae8d 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -59,12 +59,17 @@ make_pacman_conf() { "${script_path}/pacman.conf" > "${work_dir}/pacman.conf" } -# Base installation (airootfs) -make_basefs() { - if [ -n "${verbose}" ]; then - mkarchiso -v -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" init - else - mkarchiso -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" init +# Prepare working directory and copy custom airootfs files (airootfs) +make_custom_airootfs() { + local _airootfs="${work_dir}/x86_64/airootfs" + mkdir -p -- "${_airootfs}" + + if [[ -d "${script_path}/airootfs" ]]; then + 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" + [[ -e "${_airootfs}/root" ]] && chmod -f 0750 -- "${_airootfs}/root" fi } @@ -112,10 +117,6 @@ make_setup_mkinitcpio() { # Customize installation (airootfs) make_customize_airootfs() { - cp -af --no-preserve=ownership "${script_path}/airootfs" "${work_dir}/x86_64" - - cp "${script_path}/pacman.conf" "${work_dir}/x86_64/airootfs/etc" - 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 @@ -124,9 +125,6 @@ make_customize_airootfs() { -r '/root/customize_airootfs.sh' run fi rm "${work_dir}/x86_64/airootfs/root/customize_airootfs.sh" - - [[ -e "${work_dir}/x86_64/airootfs/etc/shadow" ]] && chmod -f 0400 -- "${work_dir}/x86_64/airootfs/etc/shadow" - [[ -e "${work_dir}/x86_64/airootfs/root" ]] && chmod -f 0750 -- "${work_dir}/x86_64/airootfs/root" } # Prepare kernel/initramfs ${install_dir}/boot/ @@ -290,7 +288,7 @@ done mkdir -p "${work_dir}" run_once make_pacman_conf -run_once make_basefs +run_once make_custom_airootfs run_once make_packages run_once make_setup_mkinitcpio run_once make_customize_airootfs diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index 78afccf..1cfd724 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -1,6 +1,7 @@ amd-ucode arch-install-scripts b43-fwcutter +base bind-tools broadcom-wl btrfs-progs @@ -72,6 +73,7 @@ sdparm sg3_utils smartmontools sudo +syslinux systemd-resolvconf tcpdump terminus-font |