diff options
| author | Adriana Kobylak <anoo@us.ibm.com> | 2018-07-09 12:28:53 -0500 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-07 13:15:38 +0000 |
| commit | fb4beaa7dbf7ffdcef25292fbe188b78c339b189 (patch) | |
| tree | f8d592af9b7c368249ac1b3497681dd2a2105f47 | |
| parent | 462e1c3a6574d657b286baca768599bb3a21ceca (diff) | |
| download | talos-openbmc-fb4beaa7dbf7ffdcef25292fbe188b78c339b189.tar.gz talos-openbmc-fb4beaa7dbf7ffdcef25292fbe188b78c339b189.zip | |
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>
3 files changed, 0 insertions, 20 deletions
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 |
