diff options
| author | nl6720 <nl6720@gmail.com> | 2020-07-20 15:54:11 +0300 |
|---|---|---|
| committer | nl6720 <nl6720@gmail.com> | 2020-07-28 11:56:59 +0300 |
| commit | ba6b44f80a4a48c0b66068a32a8596b4d4fc28d8 (patch) | |
| tree | 23926bda31e372e43f32da2970950d97d7562e78 /configs/releng | |
| parent | b922e8bc9cebbb42a76da4752a10ecba0043917d (diff) | |
| download | archiso-ba6b44f80a4a48c0b66068a32a8596b4d4fc28d8.tar.gz archiso-ba6b44f80a4a48c0b66068a32a8596b4d4fc28d8.tar.bz2 | |
Copy /etc/skel/ to user's home from build.sh instead of customize_airootfs.sh
Additionally copy the files to all custom user homes, not just root's.
Diffstat (limited to 'configs/releng')
| -rwxr-xr-x | configs/releng/airootfs/root/customize_airootfs.sh | 2 | ||||
| -rwxr-xr-x | configs/releng/build.sh | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/configs/releng/airootfs/root/customize_airootfs.sh b/configs/releng/airootfs/root/customize_airootfs.sh index 2d7f2e0..3f81617 100755 --- a/configs/releng/airootfs/root/customize_airootfs.sh +++ b/configs/releng/airootfs/root/customize_airootfs.sh @@ -7,7 +7,5 @@ echo 'Warning: customize_airootfs.sh is deprecated! Support for it will be remov sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen locale-gen -cp -aT /etc/skel/ /root/ - sed -i 's/#\(PermitRootLogin \).\+/\1yes/' /etc/ssh/sshd_config sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 310204b..98f48b0 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -130,6 +130,15 @@ make_setup_mkinitcpio() { # Customize installation (airootfs) make_customize_airootfs() { + if [[ -e "${script_path}/airootfs/etc/passwd" ]]; then + while IFS=':' read -a passwd -r; do + [[ "${passwd[5]}" == '/' ]] && continue + cp -RdT --preserve=mode,timestamps,links -- "${work_dir}/x86_64/airootfs/etc/skel" "${work_dir}/x86_64/airootfs${passwd[5]}" + chown -hR -- "${passwd[2]}:${passwd[3]}" "${work_dir}/x86_64/airootfs${passwd[5]}" + + done < "${script_path}/airootfs/etc/passwd" + fi + if [[ -e "${work_dir}/x86_64/airootfs/root/customize_airootfs.sh" ]]; then if [ -n "${verbose}" ]; then mkarchiso -v -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \ @@ -305,8 +314,8 @@ mkdir -p "${work_dir}" run_once make_pacman_conf run_once make_custom_airootfs run_once make_packages -run_once make_setup_mkinitcpio run_once make_customize_airootfs +run_once make_setup_mkinitcpio run_once make_boot run_once make_boot_extra run_once make_syslinux |