diff options
| author | Seungjae Yoo <seungjaeyoo@google.com> | 2023-06-22 05:52:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-22 05:52:03 +0000 |
| commit | b8aec960d9e1e67d53610de9660b64e831ebdb0c (patch) | |
| tree | a168ed109f2604535553832c67efa6f24e6c48b7 | |
| parent | 24cc20f7282f04dfb28b8890055749af3b01bfc6 (diff) | |
| parent | 07cd496aeb9d533d62dc2c7e93545ace869674fa (diff) | |
| download | openwrt-prebuilts-b8aec960d9e1e67d53610de9660b64e831ebdb0c.tar.gz | |
Merge "Revert^2 "Change instance_name argument as webrtc_device_id"" am: 913af34ac3 am: 1c29d15a2d am: 8466356e61 am: 5bdb3c54da am: d77d306c17 am: 07cd496aeb
Original change: https://android-review.googlesource.com/c/platform/external/openwrt-prebuilts/+/2630469
Change-Id: I80e21db1c60cfc8a9835f98bf86177a5c5052899
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 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/" |