diff options
| -rwxr-xr-x | archsetup | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -609,6 +609,13 @@ create_user () { (chown -R "$username":wheel "$source_dir" >> "$logfile" 2>&1) || \ error "crash" "changing ownership of $source_dir" "$?" + + # Bootstrap DNS for git clones and AUR installs (full config in essential_services) + if [ ! -L /etc/resolv.conf ] || [ "$(readlink /etc/resolv.conf)" != "/run/systemd/resolve/stub-resolv.conf" ]; then + display "task" "bootstrapping DNS resolution" + ln -sf /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf >> "$logfile" 2>&1 || \ + error "error" "bootstrapping DNS resolution" "$?" + fi } ### User Customizations @@ -633,8 +640,8 @@ user_customizations() { >> "$logfile" 2>&1 ) || error "error" "$action" "$?" action="restoring dotfile versions" && display "task" "$action" - (cd "$dotfiles_dir" && git restore . \ - >> "$logfile" 2>&1 ) || error "error" "$action" "$?" + (cd "$dotfiles_dir" && git config --global --add safe.directory "$user_archsetup_dir" && \ + git restore . >> "$logfile" 2>&1 ) || error "error" "$action" "$?" action="creating common directories" && display "task" "$action" # Create default directories and grant permissions |