Unverified Commit e758249b authored by Kroese's avatar Kroese Committed by GitHub
Browse files

Better resolv.conf parsing 

Better resolv.conf parsing
parents 81dbc8bb 0e1993f0

.github/workflows/check.yml

+1 −1
Original line number Diff line number Diff line
@@ -11,4 +11,4 @@ jobs: 
      - name: Run ShellCheck

        uses: ludeeus/action-shellcheck@master

env:

        SHELLCHECK_OPTS: -x -e SC2002 -e SC2223 -e SC2034 -e SC2064 
        SHELLCHECK_OPTS: -x -e SC2001 -e SC2002 -e SC2223 -e SC2034 -e SC2064

run/network.sh

+8 −2
Original line number Diff line number Diff line
@@ -133,11 +133,17 @@ configureNAT () { 
  NET_OPTS="-netdev tap,ifname=${VM_NET_TAP},script=no,downscript=no,id=hostnet0"



  # Build DNS options from container /etc/resolv.conf

  mapfile -t nameservers < <(grep '^nameserver' /etc/resolv.conf | sed 's/nameserver //')

  searchdomains=$(grep '^search' /etc/resolv.conf | sed 's/search //' | sed 's/ /,/g')



  if [ "$DEBUG" = "Y" ]; then

    echo "/etc/resolv.conf:" && echo && cat /etc/resolv.conf && echo

  fi



  mapfile -t nameservers < <(grep '^nameserver' /etc/resolv.conf | sed 's/\t/ /g' | sed 's/nameserver //' | sed 's/ //g')

  searchdomains=$(grep '^search' /etc/resolv.conf | sed 's/\t/ /g' | sed 's/search //' | sed 's/#.*//' | sed 's/\s*$//g' | sed 's/ /,/g')

  domainname=$(echo "$searchdomains" | awk -F"," '{print $1}')



  for nameserver in "${nameservers[@]}"; do

    nameserver=$(echo "$nameserver" | sed 's/#.*//' )

    if ! [[ "$nameserver" =~ .*:.* ]]; then

      [[ -z "$DNS_SERVERS" ]] && DNS_SERVERS="$nameserver" || DNS_SERVERS="$DNS_SERVERS,$nameserver"

    fi