summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandr Ilenko <AIlenko@IBS.RU>2022-06-10 10:52:21 +0300
committerAlexandr Ilenko <AIlenko@IBS.RU>2022-06-10 10:52:21 +0300
commit04594a9a0e4de863047260d7df5712e25a44f1d7 (patch)
treec3d0679a5f78e2ab5dd5ffbbdedbf9a68fac6adc
parent355849f39bdb795a309b3e13662f2c0f49a989f1 (diff)
downloadopenbmc-04594a9a0e4de863047260d7df5712e25a44f1d7.tar.xz
Upd: virtual-media: rename Slot_x to USBx
-rw-r--r--meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media.bbappend1
-rw-r--r--meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media/0007-Upd-rename-Slot_-0123-to-USB-0123-in-virtual-media.j.patch53
2 files changed, 54 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 f3a0bd1e7e..31aea02c0a 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
@@ -7,6 +7,7 @@ SRC_URI += "\
file://0004-virtual-media.1-Fix-MountPointStateMachine-forceDisc.patch \
file://0005-virtual-media.1-Fix-Use-machine.forceDisconnectNbd.patch \
file://0006-Upd-disable-tls13-ciphers-for-http-protocol.patch \
+ file://0007-Upd-rename-Slot_-0123-to-USB-0123-in-virtual-media.j.patch \
"
RDEPENDS:${PN}:append = " nfs-utils-mount"
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media/0007-Upd-rename-Slot_-0123-to-USB-0123-in-virtual-media.j.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media/0007-Upd-rename-Slot_-0123-to-USB-0123-in-virtual-media.j.patch
new file mode 100644
index 0000000000..e93769800c
--- /dev/null
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/virtual-media/virtual-media/0007-Upd-rename-Slot_-0123-to-USB-0123-in-virtual-media.j.patch
@@ -0,0 +1,53 @@
+From d877cf1722ea4f5e7e0cf9e35eefb7a139580d3a Mon Sep 17 00:00:00 2001
+From: Alexandr Ilenko <AIlenko@IBS.RU>
+Date: Fri, 10 Jun 2022 10:47:12 +0300
+Subject: [PATCH 7/9] Upd: rename "Slot_[0123]" to "USB[0123]" in
+ "virtual-media.json"
+
+---
+ virtual-media.json | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/virtual-media.json b/virtual-media.json
+index 688b74a..79615c9 100644
+--- a/virtual-media.json
++++ b/virtual-media.json
+@@ -1,7 +1,7 @@
+ {
+ "InactivityTimeout": 1800,
+ "MountPoints": {
+- "Slot_0": {
++ "USB0": {
+ "EndpointId": "/nbd/0",
+ "Mode": 0,
+ "NBDDevice": "nbd0",
+@@ -9,7 +9,7 @@
+ "Timeout": 30,
+ "BlockSize": 512
+ },
+- "Slot_1": {
++ "USB1": {
+ "EndpointId": "/nbd/1",
+ "Mode": 0,
+ "NBDDevice": "nbd1",
+@@ -17,7 +17,7 @@
+ "Timeout": 30,
+ "BlockSize": 512
+ },
+- "Slot_2": {
++ "USB2": {
+ "EndpointId": "",
+ "Mode": 1,
+ "NBDDevice": "nbd2",
+@@ -25,7 +25,7 @@
+ "Timeout": 90,
+ "BlockSize": 512
+ },
+- "Slot_3": {
++ "USB3": {
+ "EndpointId": "",
+ "Mode": 1,
+ "NBDDevice": "nbd3",
+--
+2.35.1
+