diff --git a/roles/firmware/tasks/install.yml b/roles/firmware/tasks/install.yml index e1d3f1b6c..b50a94acb 100644 --- a/roles/firmware/tasks/install.yml +++ b/roles/firmware/tasks/install.yml @@ -13,8 +13,9 @@ url: "{{ item.url }}" dest: "{{ item.dest }}" with_items: - - { url: 'http://download.iiab.io/packages/brcmfmac43430-sdio.bin_2018-09-11_7.45.98.65' dest: '/lib/firmware/brcm/brcmfmac43430-sdio.bin.iiab' } - - { url: 'http://download.iiab.io/packages/brcmfmac43455-sdio.bin_2015-03-01_7.45.18.0_ub19.10.1' dest: '/lib/firmware/brcm/brcmfmac43455-sdio.bin.iiab' } + - { url: 'http://d.iiab.io/packages/brcmfmac43430-sdio.clm_blob_2018-09-11_7.45.98.65', dest: '/lib/firmware/brcm/brcmfmac43430-sdio.clm_blob.iiab' } + - { url: 'http://d.iiab.io/packages/brcmfmac43430-sdio.bin_2018-09-11_7.45.98.65', dest: '/lib/firmware/brcm/brcmfmac43430-sdio.bin.iiab' } + - { url: 'http://d.iiab.io/packages/brcmfmac43455-sdio.bin_2015-03-01_7.45.18.0_ub19.10.1', dest: '/lib/firmware/brcm/brcmfmac43455-sdio.bin.iiab' } - name: "Add 'firmware_retrieved: True' to {{ iiab_state_file }}" lineinfile: diff --git a/roles/firmware/templates/check-firmware.sh b/roles/firmware/templates/check-firmware.sh index 7a0bc5d9c..5704ca566 100644 --- a/roles/firmware/templates/check-firmware.sh +++ b/roles/firmware/templates/check-firmware.sh @@ -7,15 +7,25 @@ else echo "$FW_MODE" if ! $(diff -q /lib/firmware/brcm/brcmfmac43455-sdio.bin.iiab /lib/firmware/brcm/brcmfmac43455-sdio.bin); then cp /lib/firmware/brcm/brcmfmac43455-sdio.bin.iiab /lib/firmware/brcm/brcmfmac43455-sdio.bin + echo "replacing firmware" WARN=1 fi if ! $(diff -q /lib/firmware/brcm/brcmfmac43430-sdio.bin.iiab /lib/firmware/brcm/brcmfmac43430-sdio.bin); then cp /lib/firmware/brcm/brcmfmac43430-sdio.bin.iiab /lib/firmware/brcm/brcmfmac43430-sdio.bin + echo "replacing firmware" + WARN=1 + fi + if ! $(diff -q /lib/firmware/brcm/brcmfmac43430-sdio.clm_blob.iiab /lib/firmware/brcm/brcmfmac43430-sdio.clm_blob); then + cp /lib/firmware/brcm/brcmfmac43430-sdio.clm_blob.iiab /lib/firmware/brcm/brcmfmac43430-sdio.clm_blob + echo "replacing firmware" WARN=1 fi fi -if [ "$WARN" = "1" ] +if [ "$WARN" = "1" ]; then + echo "You should reboot now" touch /.fw_replaced + #echo "rebooting..." + #reboot else rm /.fw_replaced fi