summaryrefslogtreecommitdiff
path: root/meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media/0005-virtual-media.1-Fix-Use-machine.forceDisconnectNbd.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media/0005-virtual-media.1-Fix-Use-machine.forceDisconnectNbd.patch')
-rw-r--r--meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media/0005-virtual-media.1-Fix-Use-machine.forceDisconnectNbd.patch44
1 files changed, 44 insertions, 0 deletions
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media/0005-virtual-media.1-Fix-Use-machine.forceDisconnectNbd.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media/0005-virtual-media.1-Fix-Use-machine.forceDisconnectNbd.patch
new file mode 100644
index 0000000000..cec49a5bfd
--- /dev/null
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media/0005-virtual-media.1-Fix-Use-machine.forceDisconnectNbd.patch
@@ -0,0 +1,44 @@
+From 7b163421a714221833e586190cc358f9c6a77f9c Mon Sep 17 00:00:00 2001
+From: Alexandr Ilenko <AIlenko@IBS.RU>
+Date: Tue, 7 Jun 2022 07:13:37 +0300
+Subject: [PATCH 5/8] virtual-media.1: Fix: Use "machine.forceDisconnectNbd()"
+
+---
+ src/state/activating_state.cpp | 1 +
+ src/state/initial_state.hpp | 8 +++++++-
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/state/activating_state.cpp b/src/state/activating_state.cpp
+index c28310e..6ae7932 100644
+--- a/src/state/activating_state.cpp
++++ b/src/state/activating_state.cpp
+@@ -269,6 +269,7 @@ std::unique_ptr<resource::Process>
+ secret = std::move(secret)](int exitCode) {
+ LogMsg(Logger::Info, machine.getName(), " process ended.");
+ machine.getExitCode() = exitCode;
++ machine.forceDisconnectNbd();
+ machine.emitSubprocessStoppedEvent();
+ }))
+ {
+diff --git a/src/state/initial_state.hpp b/src/state/initial_state.hpp
+index f9255b0..0e8876a 100644
+--- a/src/state/initial_state.hpp
++++ b/src/state/initial_state.hpp
+@@ -18,7 +18,13 @@ struct InitialState : public BasicStateT<InitialState>
+ }
+
+ InitialState(interfaces::MountPointStateMachine& machine) :
+- BasicStateT(machine){};
++ BasicStateT(machine)
++ {
++ // force dissconnect stuck NBD Devices
++ machine.forceDisconnectNbd();
++ // force remove stuck USB Gadgets
++ // machine.removeUsbGadget(machine);
++ };
+
+ std::unique_ptr<BasicState> handleEvent(RegisterDbusEvent event)
+ {
+--
+2.35.1
+