diff options
| author | Daniel Mentz <danielmentz@google.com> | 2019-07-23 22:02:21 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-23 22:02:21 -0700 |
| commit | 229fd60bbe0faa1d57625dee092a64e7c359a46a (patch) | |
| tree | ce80f3df57b927fc50771c5d1e770657a36941c3 | |
| parent | 3b1941cf45fae6995d0e24ce0dfbb2d644638b5e (diff) | |
| parent | ca768b41701db3523cf002f2f30f251ba6cb08fd (diff) | |
| download | bonito-229fd60bbe0faa1d57625dee092a64e7c359a46a.tar.gz | |
Merge "Remove symlink /firmware -> /vendor/firmware_mnt" into qt-r1-dev
am: ca768b4170
Change-Id: I84f4d10e54951b2222646ed78cd6bab92e9dd22d
| -rw-r--r-- | BoardConfig-common.mk | 1 | ||||
| -rw-r--r-- | init.radio.sh | 10 | ||||
| -rw-r--r-- | ueventd.hardware.rc | 3 |
3 files changed, 8 insertions, 6 deletions
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 27ac59b1..5773daf6 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -124,7 +124,6 @@ BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE := 4068474880 BOARD_FLASH_BLOCK_SIZE := 131072 BOARD_ROOT_EXTRA_SYMLINKS := /mnt/vendor/persist:/persist -BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt:/firmware BOARD_ROOT_EXTRA_SYMLINKS += /vendor/dsp:/dsp include device/google/bonito-sepolicy/bonito-sepolicy.mk diff --git a/init.radio.sh b/init.radio.sh index c11d1a00..7b980c95 100644 --- a/init.radio.sh +++ b/init.radio.sh @@ -22,16 +22,16 @@ else prev_version_info="" fi -cur_version_info=`cat /firmware/verinfo/ver_info.txt` -if [ ! -f /firmware/verinfo/ver_info.txt -o "$prev_version_info" != "$cur_version_info" ]; then +cur_version_info=`cat /vendor/firmware_mnt/verinfo/ver_info.txt` +if [ ! -f /vendor/firmware_mnt/verinfo/ver_info.txt -o "$prev_version_info" != "$cur_version_info" ]; then rm -rf /data/vendor/radio/modem_config mkdir /data/vendor/radio/modem_config chmod 770 /data/vendor/radio/modem_config - cp -r /firmware/image/modem_pr/mcfg/configs/* /data/vendor/radio/modem_config + cp -r /vendor/firmware_mnt/image/modem_pr/mcfg/configs/* /data/vendor/radio/modem_config chown -hR radio.radio /data/vendor/radio/modem_config - cp /firmware/verinfo/ver_info.txt /data/vendor/radio/ver_info.txt + cp /vendor/firmware_mnt/verinfo/ver_info.txt /data/vendor/radio/ver_info.txt chown radio.radio /data/vendor/radio/ver_info.txt fi -cp /firmware/image/modem_pr/mbn_ota.txt /data/vendor/radio/modem_config +cp /vendor/firmware_mnt/image/modem_pr/mbn_ota.txt /data/vendor/radio/modem_config chown radio.radio /data/vendor/radio/modem_config/mbn_ota.txt echo 1 > /data/vendor/radio/copy_complete diff --git a/ueventd.hardware.rc b/ueventd.hardware.rc index 657f22a2..e9289696 100644 --- a/ueventd.hardware.rc +++ b/ueventd.hardware.rc @@ -14,6 +14,9 @@ # limitations under the License. # +# The modem image is mounted at /vendor/firmware_mnt +firmware_directories /vendor/firmware_mnt/image/ + # the DIAG device node is not world writable/readable. /dev/diag 0660 system diag |