X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=src%2Finitscripts%2Fhelper%2Faws-setup;fp=src%2Finitscripts%2Fhelper%2Faws-setup;h=cee78a2830045bf3ff0498f2268a8110ae0b676a;hp=af6d24c8b4dc54f1a5577b32efc99523f34e31f5;hb=f770492902a5c6194ecd4f596432093498ac6b66;hpb=c07c3e47f19307a28d91c7a83baed869e1ce5102 diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup index af6d24c8b4..cee78a2830 100644 --- a/src/initscripts/helper/aws-setup +++ b/src/initscripts/helper/aws-setup @@ -115,9 +115,6 @@ import_aws_configuration() { fi fi - # Import any DNS server settings - eval $(/usr/local/bin/readhash <(grep -E "^DNS([0-9])=" /var/ipfire/ethernet/settings 2>/dev/null)) - # Import network configuration # After this, no network connectivity will be available from this script due to the # renaming of the network interfaces for which they have to be shut down @@ -161,10 +158,6 @@ import_aws_configuration() { # The gateway is always the first IP address in the subnet local gateway="$(to_address $(( netaddress_num + 1 )))" - # The AWS internal DNS service is available on the second IP address of the VPC - local dns1="$(to_address $(( vpc_netaddress_num + 2 )))" - local dns2= - ( echo "RED_TYPE=STATIC" echo "RED_DEV=${interface_name}" @@ -175,8 +168,6 @@ import_aws_configuration() { echo "RED_NETADDRESS=${netaddress}" echo "RED_BROADCAST=${broadcast}" echo "DEFAULT_GATEWAY=${gateway}" - echo "DNS1=${DNS1:-${dns1}}" - echo "DNS2=${DNS2:-${dns2}}" ) >> /var/ipfire/ethernet/settings # Import aliases for RED