diff options
author | Seungjae Yoo <seungjaeyoo@google.com> | 2023-06-22 01:14:52 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-06-22 01:14:52 +0000 |
commit | 913af34ac3a33fd32ccc2663d2bf246586dd799e (patch) | |
tree | a168ed109f2604535553832c67efa6f24e6c48b7 | |
parent | 98fd406922ee121595021f1463a6981a6b0848e4 (diff) | |
parent | e2f30ac4dbfaf78df57e0bda137fda9ac7daa924 (diff) | |
download | openwrt-prebuilts-913af34ac3a33fd32ccc2663d2bf246586dd799e.tar.gz |
Merge "Revert^2 "Change instance_name argument as webrtc_device_id""android-u-beta-4-gpl
-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 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/" |