summaryrefslogtreecommitdiff
path: root/meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media/0004-virtual-media.1-Fix-MountPointStateMachine-forceDisc.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media/0004-virtual-media.1-Fix-MountPointStateMachine-forceDisc.patch')
-rw-r--r--meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media/0004-virtual-media.1-Fix-MountPointStateMachine-forceDisc.patch52
1 files changed, 52 insertions, 0 deletions
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media/0004-virtual-media.1-Fix-MountPointStateMachine-forceDisc.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media/0004-virtual-media.1-Fix-MountPointStateMachine-forceDisc.patch
new file mode 100644
index 0000000000..2fdee639ea
--- /dev/null
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media/0004-virtual-media.1-Fix-MountPointStateMachine-forceDisc.patch
@@ -0,0 +1,52 @@
+From d28d2cbc3938ad55b0e0f61048646855eb5811de Mon Sep 17 00:00:00 2001
+From: Alexandr Ilenko <AIlenko@IBS.RU>
+Date: Tue, 7 Jun 2022 07:18:59 +0300
+Subject: [PATCH 4/8] virtual-media.1: Fix:
+ "MountPointStateMachine::forceDisconnectNbd()"
+
+---
+ src/interfaces/mount_point_state_machine.hpp | 1 +
+ src/state_machine.hpp | 6 +++---
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/interfaces/mount_point_state_machine.hpp b/src/interfaces/mount_point_state_machine.hpp
+index e6b175c..c4b4391 100644
+--- a/src/interfaces/mount_point_state_machine.hpp
++++ b/src/interfaces/mount_point_state_machine.hpp
+@@ -36,6 +36,7 @@ struct MountPointStateMachine
+ virtual int& getExitCode() = 0;
+ virtual boost::asio::io_context& getIoc() = 0;
+
++ virtual void forceDisconnectNbd() = 0;
+ virtual void emitRegisterDBusEvent(
+ std::shared_ptr<sdbusplus::asio::connection> bus,
+ std::shared_ptr<sdbusplus::asio::object_server> objServer) = 0;
+diff --git a/src/state_machine.hpp b/src/state_machine.hpp
+index ed67252..0a9cf20 100644
+--- a/src/state_machine.hpp
++++ b/src/state_machine.hpp
+@@ -62,10 +62,10 @@ struct MountPointStateMachine : public interfaces::MountPointStateMachine
+ }
+ }
+
+- void forceDisconnectNbd()
++ void forceDisconnectNbd() override
+ {
+ auto process = std::make_shared<Process>(
+- ioc.get(), this->name, "/usr/sbin/nbd-client",
++ ioc, this->name, "/usr/sbin/nbd-client",
+ config.nbdDevice);
+ if (!process)
+ {
+@@ -79,7 +79,7 @@ struct MountPointStateMachine : public interfaces::MountPointStateMachine
+ config.nbdDevice.to_path(),
+ };
+
+- if (!process->spawn(args, [](int exitCode, bool) {
++ if (!process->spawn(args, [](int exitCode) {
+ LogMsg(Logger::Info, "Cleanup NBD device connection: ",
+ std::strerror(exitCode));
+ }))
+--
+2.35.1
+