diff options
| author | Saqib Khan <khansa@us.ibm.com> | 2017-09-06 23:24:40 -0500 |
|---|---|---|
| committer | Saqib Khan <khansa@us.ibm.com> | 2017-09-07 09:03:57 -0500 |
| commit | 9f0034cc2c7a3ae420d6648b6de347f119ddb44f (patch) | |
| tree | f164b37139cd7b21e6dd8a9c5a7d8807d388330e /meta-phosphor/common/recipes-phosphor/flash | |
| parent | 117f9b87df326509e1797a0a3d7b555b479fec11 (diff) | |
| download | talos-openbmc-9f0034cc2c7a3ae420d6648b6de347f119ddb44f.tar.gz talos-openbmc-9f0034cc2c7a3ae420d6648b6de347f119ddb44f.zip | |
Get the mtd# that corresponds to bmc and alt-bmc.
- The mtds that corresponds to bmc and alt-bmc holds the
correct ubi volumes for rofs-<versionId>.
Resolves openbmc/openbmc#2266
Change-Id: I27c6dba21ead40572403d05d63c89461825ea6a4
Signed-off-by: Saqib Khan <khansa@us.ibm.com>
Diffstat (limited to 'meta-phosphor/common/recipes-phosphor/flash')
| -rw-r--r-- | meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc index 8d49f50e7..4c32ab4f8 100644 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc +++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc @@ -172,15 +172,9 @@ ubi_remove() { } remount_ubi() { - # Get a list of all devices formatted as UBI - for file in /dev/mtd*; do - if [[ $(hexdump -C -n 3 $file) =~ "UBI" ]]; then - mtd="${file: -1}" - if [[ $mtd =~ ^-?[0-9]+$ ]]; then - mtds=${mtd},${mtds} - fi - fi - done + bmcmtd="$(findmtd "bmc")" + altbmcmtd="$(findmtd "alt-bmc")" + mtds="${bmcmtd: -1}","${altbmcmtd: -1}" IFS=',' read -r -a mtds <<< "$mtds" mtds=($(echo "${mtds[@]}" | tr ' ' '\n' | sort -u | tr '\n' ' ')) |
