|
|
26b18e |
From fd09200bba73011b4b7086c96e394ce875fdd38f Mon Sep 17 00:00:00 2001
|
|
|
26b18e |
From: Tony Asleson <tasleson@redhat.com>
|
|
|
26b18e |
Date: Thu, 26 Mar 2020 13:07:50 -0500
|
|
|
26b18e |
Subject: [PATCH 08/12] nvmetcli: Report save name correctly
|
|
|
26b18e |
|
|
|
26b18e |
When a user simply does 'nvmetcli restore' without
|
|
|
26b18e |
specifying a file name the default is used. However, if the
|
|
|
26b18e |
restore fails you end up with the error message:
|
|
|
26b18e |
|
|
|
26b18e |
Error processing config file at None, error [Errno 1] Operation not
|
|
|
26b18e |
permitted: '/sys/kernel/config/nvmet/ports/0/ana_groups/1', exiting
|
|
|
26b18e |
|
|
|
26b18e |
Correct file name if None in error path.
|
|
|
26b18e |
|
|
|
26b18e |
Error processing config file at /etc/nvmet/config.json, error \
|
|
|
26b18e |
[Errno 1] Operation not permitted: \
|
|
|
26b18e |
'/sys/kernel/config/nvmet/ports/1/ana_groups/1', exiting
|
|
|
26b18e |
|
|
|
26b18e |
Signed-off-by: Tony Asleson <tasleson@redhat.com>
|
|
|
26b18e |
Signed-off-by: Christoph Hellwig <hch@lst.de>
|
|
|
26b18e |
---
|
|
|
26b18e |
nvmet/__init__.py | 3 ++-
|
|
|
26b18e |
nvmetcli | 3 +++
|
|
|
26b18e |
2 files changed, 5 insertions(+), 1 deletion(-)
|
|
|
26b18e |
|
|
|
26b18e |
diff --git a/nvmet/__init__.py b/nvmet/__init__.py
|
|
|
26b18e |
index ca05de4..cf172bd 100644
|
|
|
26b18e |
--- a/nvmet/__init__.py
|
|
|
26b18e |
+++ b/nvmet/__init__.py
|
|
|
26b18e |
@@ -1 +1,2 @@
|
|
|
26b18e |
-from .nvme import Root, Subsystem, Namespace, Port, Host, Referral, ANAGroup
|
|
|
26b18e |
+from .nvme import Root, Subsystem, Namespace, Port, Host, Referral, ANAGroup,\
|
|
|
26b18e |
+ DEFAULT_SAVE_FILE
|
|
|
26b18e |
diff --git a/nvmetcli b/nvmetcli
|
|
|
26b18e |
index a646232..8ee8590 100755
|
|
|
26b18e |
--- a/nvmetcli
|
|
|
26b18e |
+++ b/nvmetcli
|
|
|
26b18e |
@@ -680,6 +680,9 @@ def restore(from_file):
|
|
|
26b18e |
try:
|
|
|
26b18e |
errors = nvme.Root().restore_from_file(from_file)
|
|
|
26b18e |
except IOError as e:
|
|
|
26b18e |
+ if not from_file:
|
|
|
26b18e |
+ from_file = nvme.DEFAULT_SAVE_FILE
|
|
|
26b18e |
+
|
|
|
26b18e |
if e.errno == errno.ENOENT:
|
|
|
26b18e |
# Not an error if the restore file is not present
|
|
|
26b18e |
print("No saved config file at %s, ok, exiting" % from_file)
|
|
|
26b18e |
--
|
|
|
26b18e |
2.29.2
|
|
|
26b18e |
|