openpower-software-manager: Move ubimount.service logic to script

The service files that manage the pnor ubi volumes and mount points are
starting to get too much logic in them. Move the logic to a shell script.

Change-Id: I57d6ff7ffb32d24704ceec77afd1d07622bc6de8
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>

1 files changed, 27 insertions, 0 deletions

diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios
index cab5f8614..2b8394718 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios
@@ -80,6 +80,29 @@ mount_squashfs() {
   fi
 }
 
+mount_ubi() {
+  pnormtd="$(findmtd pnor)"
+  pnor="${pnormtd#mtd}"
+  ubidev="/dev/ubi${pnor}"
+  mountdir="/media/${name}"
+
+  if [ ! -d "${mountdir}" ]; then
+    mkdir "${mountdir}"
+  fi
+
+  # Create a dynamic ubi volume of initial arbitrary size 1MB,
+  # the volume will grow dynamically as needed
+  vol="$(findubi "${name}")"
+  if [ -z "${vol}" ]; then
+    ubimkvol "${ubidev}" -N "${name}" -s 1MiB
+  fi
+
+  if ! is_mounted "${name}"; then
+    mountdev="ubi${pnor}:${name}"
+    mount -t ubifs "${mountdev}" "${mountdir}"
+  fi
+}
+
 case "$1" in
   ubiattach)
     attach_ubi
@@ -89,6 +112,10 @@ case "$1" in
     version="$3"
     mount_squashfs
     ;;
+  ubimount)
+    name="$2"
+    mount_ubi
+    ;;
   *)
     echo "Invalid argument"
     exit 1