summaryrefslogtreecommitdiffstats
path: root/meta-phosphor/common/recipes-phosphor/flash
diff options
context:
space:
mode:
authorAdriana Kobylak <anoo@us.ibm.com>2017-08-22 14:04:46 -0500
committerPatrick Williams <patrick@stwcx.xyz>2017-08-28 16:57:45 +0000
commit71af5d6bb167260f585cf89704e2de128f1c2da6 (patch)
treebdf99709b4ac2e8296ae05b6948e794b18919bba /meta-phosphor/common/recipes-phosphor/flash
parent1886b34114708c98e231b305ef9af9f3c7a18813 (diff)
downloadtalos-openbmc-71af5d6bb167260f585cf89704e2de128f1c2da6.tar.gz
talos-openbmc-71af5d6bb167260f585cf89704e2de128f1c2da6.zip
obmc-flash-bmc-setenv: Use unescaped instance name
Use the unescaped character in the service file (%I) to be able to check for the ascii character which is more intuitive. That way the function in the script can be used by other functions and just pass the ascii character. Change-Id: Ie07f33faaccc42eb7fd574fe6d72dac7858c380e Signed-off-by: Adriana Kobylak <anoo@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-bmc4
-rw-r--r--meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-setenv@.service2
2 files changed, 3 insertions, 3 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 c45222597..4be758584 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
@@ -140,8 +140,8 @@ remount_ubi() {
}
ubi_setenv() {
- varName="${variable%"\x3d"*}"
- value="${variable##*"\x3d"}"
+ varName="${variable%=*}"
+ value="${variable##*=}"
fw_setenv "$varName" "$value"
}
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-setenv@.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-setenv@.service
index c26273f63..73b55d4f3 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-setenv@.service
+++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-bmc-setenv@.service
@@ -4,5 +4,5 @@ Description=Set U-Boot environment variable
[Service]
Type=oneshot
RemainAfterExit=no
-ExecStart=/usr/bin/env obmc-flash-bmc ubisetenv %i
+ExecStart=/usr/bin/env obmc-flash-bmc ubisetenv %I
SyslogIdentifier=obmc-flash-bmc
OpenPOWER on IntegriCloud