summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeungjae Yoo <seungjaeyoo@google.com>2023-06-19 11:28:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-06-19 11:28:20 +0000
commitc6a3be6b839fe22f3c52cb58f1e89b2ab5ea2be5 (patch)
treea168ed109f2604535553832c67efa6f24e6c48b7
parentd289d268288379b376ba51d7b33c1b4f58f4e77c (diff)
parent42e4734d7184653d8e7d2643e77175fb5325b02e (diff)
downloadopenwrt-prebuilts-c6a3be6b839fe22f3c52cb58f1e89b2ab5ea2be5.tar.gz
Change instance_name argument as webrtc_device_id am: b1f09eb836 am: c53dd0d1cd am: 4227dfb73f am: 6f5909d12b am: b76e8ab9ef am: 42e4734d71
Original change: https://android-review.googlesource.com/c/platform/external/openwrt-prebuilts/+/2628869 Change-Id: Ibfe8f413dad38cb80650d2782fa9187e19e9382d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--shared/uci-defaults/0_default_config8
1 files changed, 4 insertions, 4 deletions
diff --git a/shared/uci-defaults/0_default_config b/shared/uci-defaults/0_default_config
index 010de78..1f14223 100644
--- a/shared/uci-defaults/0_default_config
+++ b/shared/uci-defaults/0_default_config
@@ -7,7 +7,7 @@ rule_name=$(uci add network rule)
# Extract configs from /proc/cmdline
bridged_wifi_tap=false
-instance_name="cvd-1"
+webrtc_device_id="cvd-1"
words=$(cat /proc/cmdline)
while
word=${words%%" "*}
@@ -19,8 +19,8 @@ while
uci set network.wan.ipaddr=${word#*"="}
elif echo "$word" | grep "^wan_broadcast="; then
uci set network.wan.broadcast=${word#*"="}
- elif echo "$word" | grep "^instance_name="; then
- instance_name=${word#*"="}
+ elif echo "$word" | grep "^webrtc_device_id="; then
+ webrtc_device_id=${word#*"="}
fi
next=${words#*" "}
[ "$words" != "$next" ]
@@ -39,7 +39,7 @@ ln -sf $(readlink -f /www/cgi-bin/cgi-backup) /www/cgi-bin/cgi-backup
ln -sf $(readlink -f /www/cgi-bin/cgi-download) /www/cgi-bin/cgi-download
ln -sf $(readlink -f /www/cgi-bin/cgi-exec) /www/cgi-bin/cgi-exec
ln -sf $(readlink -f /www/cgi-bin/cgi-upload) /www/cgi-bin/cgi-upload
-web_base="devices/$instance_name/openwrt"
+web_base="devices/$webrtc_device_id/openwrt"
mkdir -p "/www/$web_base/"
mv /www/cgi-bin "/www/$web_base/"
mv /www/luci-static "/www/$web_base/"