diff options
| author | Adriana Kobylak <anoo@us.ibm.com> | 2017-08-21 11:00:56 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-08-24 02:42:25 +0000 |
| commit | 4c2576ab9e4e85e71419137c1a00bdc2ea1337cf (patch) | |
| tree | 1db1e1af017bf3cb049ce1fc39180229bf31072b /meta-phosphor/common/recipes-phosphor/flash | |
| parent | b0396780f9cc141d2fc4613cbfcd4ca17d2a1db1 (diff) | |
| download | talos-openbmc-4c2576ab9e4e85e71419137c1a00bdc2ea1337cf.tar.gz talos-openbmc-4c2576ab9e4e85e71419137c1a00bdc2ea1337cf.zip | |
BMC: Make volume names consistent
Name the BMC volume names consistently in the build process and
applications to be <name>-<id> for readability. For names, use
rofs and rwfs instead of ro and rw.
Change-Id: I860f740fb7d0292e4ee09493730db1d1f67c2ae5
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Diffstat (limited to 'meta-phosphor/common/recipes-phosphor/flash')
5 files changed, 5 insertions, 5 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 d17ee5c36..a75badd73 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 @@ -107,7 +107,7 @@ remount_ubi() { name="${name%Character*}" name="$(echo -e "${name}" | tr -d '[:space:]')" - if [[ ${name} == ro-* ]]; then + if [[ ${name} == rofs-* ]]; then mountdir="/media/${name}" mkdir -p "${mountdir}" ubiblock --create /dev/ubi${mtd}_${element} &> /dev/null diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service index 0ac9a430c..78975133d 100644 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service +++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro-remove@.service @@ -4,5 +4,5 @@ Description=Deletes read-only and kernel ubi volume %I [Service] Type=oneshot RemainAfterExit=no -ExecStart={sbindir}/obmc-flash-bmc ubiremove ro-%i +ExecStart={sbindir}/obmc-flash-bmc ubiremove rofs-%i ExecStart={sbindir}/obmc-flash-bmc ubiremove kernel-%i diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service index 4dec96efb..2d7b70335 100644 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service +++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubiro@.service @@ -4,5 +4,5 @@ Description=Create read-only ubi volumes %I [Service] Type=oneshot RemainAfterExit=no -ExecStart={sbindir}/obmc-flash-bmc ubiro {RO_MTD} ro-%i %i +ExecStart={sbindir}/obmc-flash-bmc ubiro {RO_MTD} rofs-%i %i ExecStart={sbindir}/obmc-flash-bmc ubikernel {KERNEL_MTD} kernel-%i %i diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service index 71a652bb4..c57040ea7 100644 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service +++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw-remove.service @@ -4,4 +4,4 @@ Description=Deletes BMC read-write ubi volume [Service] Type=oneshot RemainAfterExit=no -ExecStart={sbindir}/obmc-flash-bmc ubiremove rw +ExecStart={sbindir}/obmc-flash-bmc ubiremove rwfs diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service index cef57e008..07820fb27 100644 --- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service +++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-ubirw.service @@ -4,4 +4,4 @@ Description=Create BMC read-write ubi volume [Service] Type=oneshot RemainAfterExit=no -ExecStart={sbindir}/obmc-flash-bmc ubirw {RW_MTD} rw +ExecStart={sbindir}/obmc-flash-bmc ubirw {RW_MTD} rwfs |
