Verified Commit ba6b44f8 authored by nl6720's avatar nl6720
Browse files

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.
parent b922e8bc
......@@ -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
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment