Emulators: Do not start dnsmasq in initnetwork.sh

brilloemulator_*/bsp/initnetwork.sh starts dnsmasq to enable host
name resolution. This was introduced by commit 5b6e87a. However, a
later CL in system/connectivity/shill does almost the same thing:

 commit d5d3482e261beaee1a13622143d4abf728165fb9
 Author: Peter Qiu <zqiu@google.com>
 Date:   Wed Sep 30 17:48:42 2015 -0700

     Support DNS server proxy on Android

Consequently, dnsmasq is now first started by shill, and then again
by initnetwork.sh. The end result is that host name resolution no
longer works.

Fix that by removing all dnsmasq-related code from initnetwork.sh
and from emulator SELinux policy.

Change-Id: Ibe54fc0be6b6b8173cf37b8bf6e2a254925da81b
Signed-off-by: Yu Ning <yu.ning@intel.com>

8 files changed, 0 insertions, 28 deletions

diff --git a/brilloemulator_arm/bsp/initnetwork.sh b/brilloemulator_arm/bsp/initnetwork.sh
index d2f8ca7..ed8b493 100644
--- a/brilloemulator_arm/bsp/initnetwork.sh
+++ b/brilloemulator_arm/bsp/initnetwork.sh
@@ -5,7 +5,3 @@ ifconfig eth0 10.0.2.15 netmask 255.255.255.0 up
 route add default gw 10.0.2.2
 # Open up port 5555 for adb
 iptables -I INPUT -p tcp --dport 5555 -j ACCEPT -w
-# Run dnsmasq so we can access hosts on the Internet. This is needed since
-# Bionic hard-wires DNS requests to go to 0.0.0.0, so this acts as a DNS proxy.
-dnsmasq --no-hosts --listen-address=127.0.0.1 --no-resolv --server=8.8.8.8 \
-  --pid-file < /dev/null
diff --git a/brilloemulator_arm/bsp/sepolicy/brillo_setup.te b/brilloemulator_arm/bsp/sepolicy/brillo_setup.te
deleted file mode 100644
index d949fe7..0000000
--- a/brilloemulator_arm/bsp/sepolicy/brillo_setup.te
+++ /dev/null
@@ -1,3 +0,0 @@
-# Needed for dnsmasq (run from initnetwork.sh).
-allow brillo_setup dnsmasq_exec:file { execute execute_no_trans getattr open read };
-allow brillo_setup self:capability { dac_override net_bind_service setgid setuid };
diff --git a/brilloemulator_arm64/bsp/initnetwork.sh b/brilloemulator_arm64/bsp/initnetwork.sh
index d2f8ca7..ed8b493 100644
--- a/brilloemulator_arm64/bsp/initnetwork.sh
+++ b/brilloemulator_arm64/bsp/initnetwork.sh
@@ -5,7 +5,3 @@ ifconfig eth0 10.0.2.15 netmask 255.255.255.0 up
 route add default gw 10.0.2.2
 # Open up port 5555 for adb
 iptables -I INPUT -p tcp --dport 5555 -j ACCEPT -w
-# Run dnsmasq so we can access hosts on the Internet. This is needed since
-# Bionic hard-wires DNS requests to go to 0.0.0.0, so this acts as a DNS proxy.
-dnsmasq --no-hosts --listen-address=127.0.0.1 --no-resolv --server=8.8.8.8 \
-  --pid-file < /dev/null
diff --git a/brilloemulator_arm64/bsp/sepolicy/brillo_setup.te b/brilloemulator_arm64/bsp/sepolicy/brillo_setup.te
deleted file mode 100644
index d949fe7..0000000
--- a/brilloemulator_arm64/bsp/sepolicy/brillo_setup.te
+++ /dev/null
@@ -1,3 +0,0 @@
-# Needed for dnsmasq (run from initnetwork.sh).
-allow brillo_setup dnsmasq_exec:file { execute execute_no_trans getattr open read };
-allow brillo_setup self:capability { dac_override net_bind_service setgid setuid };
diff --git a/brilloemulator_x86/bsp/initnetwork.sh b/brilloemulator_x86/bsp/initnetwork.sh
index d2f8ca7..ed8b493 100644
--- a/brilloemulator_x86/bsp/initnetwork.sh
+++ b/brilloemulator_x86/bsp/initnetwork.sh
@@ -5,7 +5,3 @@ ifconfig eth0 10.0.2.15 netmask 255.255.255.0 up
 route add default gw 10.0.2.2
 # Open up port 5555 for adb
 iptables -I INPUT -p tcp --dport 5555 -j ACCEPT -w
-# Run dnsmasq so we can access hosts on the Internet. This is needed since
-# Bionic hard-wires DNS requests to go to 0.0.0.0, so this acts as a DNS proxy.
-dnsmasq --no-hosts --listen-address=127.0.0.1 --no-resolv --server=8.8.8.8 \
-  --pid-file < /dev/null
diff --git a/brilloemulator_x86/bsp/sepolicy/brillo_setup.te b/brilloemulator_x86/bsp/sepolicy/brillo_setup.te
deleted file mode 100644
index 5834064..0000000
--- a/brilloemulator_x86/bsp/sepolicy/brillo_setup.te
+++ /dev/null
@@ -1,3 +0,0 @@
-# Needed for dnsmasq (run from initnetwork.sh).
-allow brillo_setup dnsmasq_exec:file { execute execute_no_trans getattr open read };
-allow brillo_setup self:capability { net_bind_service setgid setuid };
diff --git a/brilloemulator_x86_64/bsp/initnetwork.sh b/brilloemulator_x86_64/bsp/initnetwork.sh
index d2f8ca7..ed8b493 100644
--- a/brilloemulator_x86_64/bsp/initnetwork.sh
+++ b/brilloemulator_x86_64/bsp/initnetwork.sh
@@ -5,7 +5,3 @@ ifconfig eth0 10.0.2.15 netmask 255.255.255.0 up
 route add default gw 10.0.2.2
 # Open up port 5555 for adb
 iptables -I INPUT -p tcp --dport 5555 -j ACCEPT -w
-# Run dnsmasq so we can access hosts on the Internet. This is needed since
-# Bionic hard-wires DNS requests to go to 0.0.0.0, so this acts as a DNS proxy.
-dnsmasq --no-hosts --listen-address=127.0.0.1 --no-resolv --server=8.8.8.8 \
-  --pid-file < /dev/null
diff --git a/brilloemulator_x86_64/bsp/sepolicy/brillo_setup.te b/brilloemulator_x86_64/bsp/sepolicy/brillo_setup.te
deleted file mode 100644
index 5834064..0000000
--- a/brilloemulator_x86_64/bsp/sepolicy/brillo_setup.te
+++ /dev/null
@@ -1,3 +0,0 @@
-# Needed for dnsmasq (run from initnetwork.sh).
-allow brillo_setup dnsmasq_exec:file { execute execute_no_trans getattr open read };
-allow brillo_setup self:capability { net_bind_service setgid setuid };