diff options
| author | Dan Shi <dshi@google.com> | 2023-06-19 21:59:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-19 21:59:49 +0000 |
| commit | 6c3b4942248e41293c7812b350e0acbc274f2d4e (patch) | |
| tree | d0897532c3cb7b76d06fbdf1cbf5d2bed2392356 | |
| parent | 42e4734d7184653d8e7d2643e77175fb5325b02e (diff) | |
| parent | 8726d6817e18d2832fad428622ed236167695aaa (diff) | |
| download | openwrt-prebuilts-6c3b4942248e41293c7812b350e0acbc274f2d4e.tar.gz | |
Revert "Change instance_name argument as webrtc_device_id" am: 6e56aba22d am: 98fd406922 am: 4b86230a39 am: dab42943c5 am: 8726d6817e
Original change: https://android-review.googlesource.com/c/platform/external/openwrt-prebuilts/+/2630210
Change-Id: Iaa43f76bc222c1681696b2e39a58f7b79ca66013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | shared/uci-defaults/0_default_config | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/shared/uci-defaults/0_default_config b/shared/uci-defaults/0_default_config index 1f14223..010de78 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 -webrtc_device_id="cvd-1" +instance_name="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 "^webrtc_device_id="; then - webrtc_device_id=${word#*"="} + elif echo "$word" | grep "^instance_name="; then + instance_name=${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/$webrtc_device_id/openwrt" +web_base="devices/$instance_name/openwrt" mkdir -p "/www/$web_base/" mv /www/cgi-bin "/www/$web_base/" mv /www/luci-static "/www/$web_base/" |