diff options
| author | Evgeny Alekseev (IBS Group) <ealekseev@ibs.sila.ru> | 2022-09-15 16:20:56 +0300 |
|---|---|---|
| committer | Evgeny Alekseev (IBS Group) <ealekseev@ibs.sila.ru> | 2022-09-15 16:20:56 +0300 |
| commit | 79aba3a435ab97f6317f6885e5afe319ebf37b96 (patch) | |
| tree | 0ea302b662d62fcfb9dfba55bb1f327a55a6615d | |
| parent | d920a5262bd621837076aa69069f2ea224a384ac (diff) | |
| parent | 04dd86fc2d28b9530644340bb0aa1b31c232dc48 (diff) | |
| download | openbmc-79aba3a435ab97f6317f6885e5afe319ebf37b96.tar.xz | |
Merge branch 'sila-rebase' of git.sila.ru:pub/openbmc/openbmc into sila-rebase
2 files changed, 29 insertions, 0 deletions
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media.bbappend b/meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media.bbappend index b52bac1be5..c4a9e78498 100644 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media.bbappend +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media.bbappend @@ -17,6 +17,7 @@ SRC_URI += "\ file://0014-virtual-media.1-Upd-Use-usb-ctrl-instead-of-sysfs-.-.patch \ file://0015-virtual-media.1-Fix-Use-usb-ctrl-cdrom-is-pre-config.patch \ file://0016-Fix-add-configuration-usb-iso-in-proxy-mode.patch \ + file://0017-Fix-virtual-media-nbd-client-exits-with-netlink.patch \ " RDEPENDS:${PN}:append = " nfs-utils-mount phosphor-misc-usb-ctrl" diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media/0017-Fix-virtual-media-nbd-client-exits-with-netlink.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media/0017-Fix-virtual-media-nbd-client-exits-with-netlink.patch new file mode 100644 index 0000000000..97150e5350 --- /dev/null +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media/0017-Fix-virtual-media-nbd-client-exits-with-netlink.patch @@ -0,0 +1,28 @@ +From d18ffa2e3e0ef7b0e52dee22e5ff1a366c724685 Mon Sep 17 00:00:00 2001 +From: Alexandr Ilenko <AIlenko@IBS.RU> +Date: Thu, 15 Sep 2022 09:29:54 +0300 +Subject: [PATCH] Fix: virtual-media: nbd-client exits with netlink + +--- + src/configuration.hpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/configuration.hpp b/src/configuration.hpp +index 0a713a5..0c83123 100644 +--- a/src/configuration.hpp ++++ b/src/configuration.hpp +@@ -50,6 +50,11 @@ class Configuration + std::to_string(mp.timeout.value_or(defaultTimeout)); + std::vector<std::string> args = { + "-t", timeout, "-u", mp.unixSocket, mp.nbdDevice.to_path(), ++ // Let`s use old configuration way (via ioctl), ++ // because: ++ // - netlink still is not required (as a new auto dependency), ++ // - client exits immediately just after netlink configuration. ++ "-nonetlink", + "-n"}; + return args; + } +-- +2.35.1 + |