diff options
author | Dan Shi <dshi@google.com> | 2023-06-19 19:09:38 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-19 19:09:38 +0000 |
commit | 98fd406922ee121595021f1463a6981a6b0848e4 (patch) | |
tree | d0897532c3cb7b76d06fbdf1cbf5d2bed2392356 | |
parent | c53dd0d1cdbde5da70cf5cba9f0abdc7d66cca51 (diff) | |
parent | 6e56aba22d0a109af07000fa5c8c714ad9751810 (diff) | |
download | openwrt-prebuilts-98fd406922ee121595021f1463a6981a6b0848e4.tar.gz |
Revert "Change instance_name argument as webrtc_device_id" am: 6e56aba22d
Original change: https://android-review.googlesource.com/c/platform/external/openwrt-prebuilts/+/2630210
Change-Id: Ic887285903b76a7a1561194dd93aaa9a2c3d36e6
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/" |