From fb4beaa7dbf7ffdcef25292fbe188b78c339b189 Mon Sep 17 00:00:00 2001
From: Adriana Kobylak <anoo@us.ibm.com>
Date: Mon, 9 Jul 2018 12:28:53 -0500
Subject: openpower-software-manager: Remove ubiclear

With commit 494894d69c88cf4909993227af2dd8f2ca938752,
the code to perform a factory reset (ubiclear) is now an API
call instead of a service call, so we can remove the service.

Tested: Host factory reset still works.

Change-Id: Ifb5876eee30332b2e6c0923cf315349c69c78fcc
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
---
 .../recipes-phosphor/flash/openpower-software-manager.bb      |  1 -
 .../flash/openpower-software-manager/obmc-flash-bios          | 11 -----------
 .../obmc-flash-bios-ubiclear@.service                         |  8 --------
 3 files changed, 20 deletions(-)
 delete mode 100644 meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiclear@.service

(limited to 'meta-openbmc-machines')

diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager.bb
index 35826be66..cd17e0d5c 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager.bb
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager.bb
@@ -52,7 +52,6 @@ SYSTEMD_SERVICE_${PN} += " \
         obmc-flash-bios-ubipatch.service \
         obmc-flash-bios-ubiremount.service \
         obmc-flash-bios-updatesymlinks.service \
-        obmc-flash-bios-ubiclear@.service \
         obmc-flash-bios-cleanup.service \
         obmc-flash-bios-enable-clearvolatile@.service \
         obmc-flash-bios-check-clearvolatile@.service \
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 dabd538e9..298a9c41a 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
@@ -265,13 +265,6 @@ update_symlinks() {
   fi
 }
 
-clear_ubi() {
-  mountdir="/media/${name}"
-  if is_mounted "${name}"; then
-    rm -rf $mountdir/..?* $mountdir/.[!.]* $mountdir/*
-  fi
-}
-
 ubi_cleanup() {
     # When ubi_cleanup is run, it expects one or no active version.
     activeVersion=$(busctl --list --no-pager tree \
@@ -350,10 +343,6 @@ case "$1" in
   updatesymlinks)
     update_symlinks
     ;;
-  ubiclear)
-    name="$2"
-    clear_ubi
-    ;;
   ubicleanup)
     ubi_cleanup
     ;;
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiclear@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiclear@.service
deleted file mode 100644
index b84035f13..000000000
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/flash/openpower-software-manager/obmc-flash-bios-ubiclear@.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Clear UBIFS volume %i
-
-[Service]
-Type=oneshot
-RemainAfterExit=no
-ExecStart=/usr/bin/env obmc-flash-bios ubiclear %i
-SyslogIdentifier=obmc-flash-bios
-- 
cgit v1.2.3