Merge pull request #806 from dkoper/master

adding grep to confirm expected nslookup output
This commit is contained in:
Adrian Cole 2012-08-26 23:24:26 -07:00
commit 7f53d74250
7 changed files with 7 additions and 7 deletions

View File

@ -118,7 +118,7 @@ function ensure_hostname_in_hosts() {
# download locations for many services are at public dns # download locations for many services are at public dns
function ensure_can_resolve_public_dns() { function ensure_can_resolve_public_dns() {
nslookup yahoo.com > /dev/null || echo nameserver 208.67.222.222 >> /etc/resolv.conf nslookup yahoo.com | grep yahoo.com > /dev/null || echo nameserver 208.67.222.222 >> /etc/resolv.conf
} }
function setupPublicCurl() { function setupPublicCurl() {

View File

@ -118,7 +118,7 @@ function ensure_hostname_in_hosts() {
# download locations for many services are at public dns # download locations for many services are at public dns
function ensure_can_resolve_public_dns() { function ensure_can_resolve_public_dns() {
nslookup yahoo.com > /dev/null || echo nameserver 208.67.222.222 >> /etc/resolv.conf nslookup yahoo.com | grep yahoo.com > /dev/null || echo nameserver 208.67.222.222 >> /etc/resolv.conf
} }
function setupPublicCurl() { function setupPublicCurl() {

View File

@ -118,7 +118,7 @@ function ensure_hostname_in_hosts() {
# download locations for many services are at public dns # download locations for many services are at public dns
function ensure_can_resolve_public_dns() { function ensure_can_resolve_public_dns() {
nslookup yahoo.com > /dev/null || echo nameserver 208.67.222.222 >> /etc/resolv.conf nslookup yahoo.com | grep yahoo.com > /dev/null || echo nameserver 208.67.222.222 >> /etc/resolv.conf
} }
function setupPublicCurl() { function setupPublicCurl() {

View File

@ -117,7 +117,7 @@ function ensure_hostname_in_hosts() {
# download locations for many services are at public dns # download locations for many services are at public dns
function ensure_can_resolve_public_dns() { function ensure_can_resolve_public_dns() {
nslookup yahoo.com > /dev/null || echo nameserver 208.67.222.222 >> /etc/resolv.conf nslookup yahoo.com | grep yahoo.com > /dev/null || echo nameserver 208.67.222.222 >> /etc/resolv.conf
} }
function setupPublicCurl() { function setupPublicCurl() {

View File

@ -33,7 +33,7 @@ function ensure_hostname_in_hosts() {
# download locations for many services are at public dns # download locations for many services are at public dns
function ensure_can_resolve_public_dns() { function ensure_can_resolve_public_dns() {
nslookup yahoo.com > /dev/null || echo nameserver 208.67.222.222 >> /etc/resolv.conf nslookup yahoo.com | grep yahoo.com > /dev/null || echo nameserver 208.67.222.222 >> /etc/resolv.conf
} }
function setupPublicCurl() { function setupPublicCurl() {

View File

@ -118,7 +118,7 @@ function ensure_hostname_in_hosts() {
# download locations for many services are at public dns # download locations for many services are at public dns
function ensure_can_resolve_public_dns() { function ensure_can_resolve_public_dns() {
nslookup yahoo.com > /dev/null || echo nameserver 208.67.222.222 >> /etc/resolv.conf nslookup yahoo.com | grep yahoo.com > /dev/null || echo nameserver 208.67.222.222 >> /etc/resolv.conf
} }
function setupPublicCurl() { function setupPublicCurl() {

View File

@ -118,7 +118,7 @@ function ensure_hostname_in_hosts() {
# download locations for many services are at public dns # download locations for many services are at public dns
function ensure_can_resolve_public_dns() { function ensure_can_resolve_public_dns() {
nslookup yahoo.com > /dev/null || echo nameserver 208.67.222.222 >> /etc/resolv.conf nslookup yahoo.com | grep yahoo.com > /dev/null || echo nameserver 208.67.222.222 >> /etc/resolv.conf
} }
function setupPublicCurl() { function setupPublicCurl() {