Use flash id to write image to flash
Update the item updater helper functions to take the flash id instead of
the version id since flash id is the name of the volumes/partitions.
The flash id was being persisted for the mmc layout with the name of
"partlabel". This is not needed anymore since the flash id is now being
passed by the service files.
The write functions/service files still use the version id to know where
the image files are located in /tmp/. They then set the value of flash
id (Path property) which is then used by the other functions such as
Delete and setting the u-boot environment variables.
Tested: Code update and Delete functions work on ubi and mmc.
Change-Id: I87c5b8ae2e24af30256dc3b436859835f14cda05
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
diff --git a/obmc-flash-bmc b/obmc-flash-bmc
index 8cf49c1..aa9773f 100644
--- a/obmc-flash-bmc
+++ b/obmc-flash-bmc
@@ -232,8 +232,11 @@
vols=$(ubinfo -a | grep "rofs-" | cut -c 14-)
vols=(${vols})
else
+ flashid=$(busctl get-property xyz.openbmc_project.Software.BMC.Updater \
+ "/xyz/openbmc_project/software/${activeVersion}" \
+ xyz.openbmc_project.Common.FilePath Path | awk '{print $NF;}' | tr -d '"')
vols=$(ubinfo -a | grep "rofs-" | \
- grep -v "$activeVersion" | cut -c 14-)
+ grep -v "$flashid" | cut -c 14-) || true
vols=(${vols})
fi
@@ -370,7 +373,7 @@
}
update_env_vars() {
- vol="$(findubi rofs-"${version}")"
+ vol="$(findubi rofs-"${flashid}")"
if [ -z "${vol}" ]; then
return 1
fi
@@ -379,7 +382,7 @@
if [ ! -e "${block}" ]; then
return 1
fi
- ubi_setenv "kernelname=kernel-${version}"
+ ubi_setenv "kernelname=kernel-${flashid}"
ubi_setenv "ubiblock=$(echo "${ubidevid}" | sed 's/_/,/')"
ubi_setenv "root=${block}"
}
@@ -554,31 +557,20 @@
mount ${hostfwdir}/hostfw-${label} ${hostfwdir}/alternate -o ro
fi
- # Store the label where the other properties like purpose and priority are
- # preserved via the storePriority() function in the serialize files, so that
- # it can be used for the remove function.
- label_dir="/var/lib/phosphor-bmc-code-mgmt/${version}"
- label_file="${label_dir}/partlabel"
- mkdir -p "${label_dir}"
- echo "${label}" > "${label_file}"
-
set_flashid "${label}"
}
mmc_remove() {
# Render the filesystem unbootable by wiping out the first 1MB, this
# invalidates the filesystem header.
- # If the label property does not exist, assume it's the secondary
- # (non-running) one since the running device should not be erased.
- label=""
- label_file="/var/lib/phosphor-bmc-code-mgmt/${version}/partlabel"
- if [ -f "${label_file}" ]; then
- label="$(cat "${label_file}")"
- else
- label="$(mmc_get_secondary_label)"
+ # Check if the requested id is the one the BMC is running from since dd
+ # can still write and corrupt the running partition.
+ primaryid="$(mmc_get_primary_label)"
+ if [[ "${flashid}" == "${primaryid}" ]]; then
+ return -1
fi
- dd if=/dev/zero of=/dev/disk/by-partlabel/boot-${label} count=2048
- dd if=/dev/zero of=/dev/disk/by-partlabel/rofs-${label} count=2048
+ dd if=/dev/zero of=/dev/disk/by-partlabel/boot-${flashid} count=2048
+ dd if=/dev/zero of=/dev/disk/by-partlabel/rofs-${flashid} count=2048
hostfw_alt="hostfw/alternate"
if grep -q "${hostfw_alt}" /proc/mounts; then
@@ -588,30 +580,14 @@
hostfw_base="hostfw "
if grep -q "${hostfw_base}" /proc/mounts; then
hostfw_base=$(grep "${hostfw_base}" /proc/mounts | cut -d " " -f 2)
- rm -f ${hostfw_base}/hostfw-${label}
+ rm -f ${hostfw_base}/hostfw-${flashid}
fi
}
# Set the requested version as primary for the BMC to boot from upon reboot.
mmc_setprimary() {
- # Point root to the label of the requested BMC rootfs. If the label property
- # does not exist, determine if the requested version is functional or not.
- label=""
- label_file="/var/lib/phosphor-bmc-code-mgmt/${version}/partlabel"
- if [ -f "${label_file}" ]; then
- label="$(cat "${label_file}")"
- else
- functional="$(busctl call xyz.openbmc_project.ObjectMapper \
- /xyz/openbmc_project/software/functional \
- org.freedesktop.DBus.Properties Get ss \
- xyz.openbmc_project.Association endpoints)"
- if [[ "${functional}" =~ "${version}" ]]; then
- label="$(mmc_get_primary_label)"
- else
- label="$(mmc_get_secondary_label)"
- fi
- fi
- fw_setenv bootside "${label}"
+ # Point root to the flashid of the requested BMC rootfs.
+ fw_setenv bootside "${flashid}"
}
case "$1" in
@@ -665,7 +641,7 @@
backup_env_vars
;;
updateubootvars)
- version="$2"
+ flashid="$2"
update_env_vars
;;
rebootguardenable)
@@ -683,11 +659,11 @@
mmc_update
;;
mmc-remove)
- version="$2"
+ flashid="$2"
mmc_remove
;;
mmc-setprimary)
- version="$2"
+ flashid="$2"
mmc_setprimary
;;
*)