diff options
| author | Jorge Lucangeli Obes <jorgelo@google.com> | 2015-12-04 00:24:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-12-04 00:24:31 +0000 |
| commit | 72ebd283749640c3d157c60425a7cf2c4dfbd750 (patch) | |
| tree | a37e7a94b1c0306a9a437df1d97bc9207828edc5 | |
| parent | ec0f7324f7620f34193e2bef7434c2992e412b96 (diff) | |
| parent | 3308e41ccc8c927ae4a6779a8d36b67d897074c8 (diff) | |
| download | brillo-72ebd283749640c3d157c60425a7cf2c4dfbd750.tar.gz | |
Merge "Emulators: Do not start dnsmasq in initnetwork.sh"
| -rw-r--r-- | brilloemulator_arm/bsp/initnetwork.sh | 4 | ||||
| -rw-r--r-- | brilloemulator_arm/bsp/sepolicy/brillo_setup.te | 3 | ||||
| -rw-r--r-- | brilloemulator_arm64/bsp/initnetwork.sh | 4 | ||||
| -rw-r--r-- | brilloemulator_arm64/bsp/sepolicy/brillo_setup.te | 3 | ||||
| -rw-r--r-- | brilloemulator_x86/bsp/initnetwork.sh | 4 | ||||
| -rw-r--r-- | brilloemulator_x86/bsp/sepolicy/brillo_setup.te | 3 | ||||
| -rw-r--r-- | brilloemulator_x86_64/bsp/initnetwork.sh | 4 | ||||
| -rw-r--r-- | brilloemulator_x86_64/bsp/sepolicy/brillo_setup.te | 3 |
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 }; |