Bring back setup_wifi interface configuration to T QPR
This code is present in Cuttlefish AOSP but missing from
tm-qpr-dev. It is used by downstream devices to tweak which
interface to setup as the virtual wlan0 connection
Bug: 246273743
Test: build flash and boot trout
Change-Id: I49fe93479887768195917f3fb5d5f5cda4851867
diff --git a/guest/commands/setup_wifi/main.cpp b/guest/commands/setup_wifi/main.cpp
index 4a91442..2727fb4 100644
--- a/guest/commands/setup_wifi/main.cpp
+++ b/guest/commands/setup_wifi/main.cpp
@@ -33,6 +33,7 @@
#include "common/libs/net/network_interface_manager.h"
DEFINE_string(mac_prefix, "", "mac prefix to use for wlan0");
+DEFINE_string(interface, "eth2", "interface to create wlan wrapper on");
static std::array<unsigned char, 6> prefix_to_mac(
const std::string& mac_prefix) {
@@ -138,9 +139,9 @@
gflags::ParseCommandLineFlags(&argc, &argv, true);
- int renamed_eth2 = RenameNetwork("eth2", "buried_eth2");
- if (renamed_eth2 != 0) {
- return renamed_eth2;
+ int renamed_if = RenameNetwork(FLAGS_interface, "buried_" + FLAGS_interface);
+ if (renamed_if != 0) {
+ return renamed_if;
}
- return CreateWifiWrapper("buried_eth2", "wlan0");
+ return CreateWifiWrapper("buried_" + FLAGS_interface, "wlan0");
}
