diff --git a/s390-tools-08-rust-pvimg-Fix-flag-parsing-for-allowing-dump.patch b/s390-tools-08-rust-pvimg-Fix-flag-parsing-for-allowing-dump.patch new file mode 100644 index 0000000..9941241 --- /dev/null +++ b/s390-tools-08-rust-pvimg-Fix-flag-parsing-for-allowing-dump.patch @@ -0,0 +1,31 @@ +From caaf2b2116235d282c2561f0bf6f62b0033c78c4 Mon Sep 17 00:00:00 2001 +From: Jakob Naucke +Date: Wed, 15 Jan 2025 17:36:01 +0100 +Subject: [PATCH] rust/pvimg: Fix flag parsing for allowing dump +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Parsing of pvimg flags did not pick up allowing dumping correctly. + +Fixes: f4cf4ae6ebb1 (rust: Add a new tool called 'pvimg') +Reviewed-by: Marc Hartmayer +Signed-off-by: Jakob Naucke +Signed-off-by: Jan Höppner +--- + rust/pvimg/src/cmd/create.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rust/pvimg/src/cmd/create.rs b/rust/pvimg/src/cmd/create.rs +index 3e2ca655..c9d39745 100644 +--- a/rust/pvimg/src/cmd/create.rs ++++ b/rust/pvimg/src/cmd/create.rs +@@ -55,7 +55,7 @@ fn parse_flags( + .and(Some(PcfV1::all_disabled([PcfV1::AllowDumping]))), + lf.enable_dump + .filter(|x| *x) +- .and(Some(PcfV1::all_disabled([PcfV1::AllowDumping]))), ++ .and(Some(PcfV1::all_enabled([PcfV1::AllowDumping]))), + lf.disable_pckmo + .filter(|x| *x) + .and(Some(PcfV1::all_disabled([ diff --git a/s390-tools-09-rust-pvimg-Document-the-change-from--comm-key-to--cck.patch b/s390-tools-09-rust-pvimg-Document-the-change-from--comm-key-to--cck.patch new file mode 100644 index 0000000..b1edf9f --- /dev/null +++ b/s390-tools-09-rust-pvimg-Document-the-change-from--comm-key-to--cck.patch @@ -0,0 +1,32 @@ +From 7bc12d0202d5819442dd4c32755feb5eb19af70b Mon Sep 17 00:00:00 2001 +From: Marc Hartmayer +Date: Wed, 8 Jan 2025 12:33:05 +0100 +Subject: [PATCH] rust/pvimg: Document the change from '--comm-key' to '--cck' + in the help message + +This fixes problems when users search for '--comm-key' in the help +message. + +Fixes: 5b6d7a467dc3 ("rust/pvimg: Add '--cck ' command line option and make '--comm-key' an alias") +Reviewed-by: Steffen Eiden +Reviewed-by: Nico Boehr +Signed-off-by: Marc Hartmayer +Signed-off-by: Steffen Eiden +--- + rust/pvimg/src/cli.rs | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/rust/pvimg/src/cli.rs b/rust/pvimg/src/cli.rs +index 446e9b74..f5a8c308 100644 +--- a/rust/pvimg/src/cli.rs ++++ b/rust/pvimg/src/cli.rs +@@ -330,7 +330,8 @@ pub struct CreateBootImageArgs { + + /// Use the content of FILE as the customer-communication key (CCK). + /// +- /// The file must contain exactly 32 bytes of data. ++ /// The file must contain exactly 32 bytes of data. This option used to be ++ /// called '--comm-key' in previous versions. + #[arg(long, value_name = "FILE", visible_alias = "comm-key")] + pub cck: Option, + diff --git a/s390-tools.changes b/s390-tools.changes index 295947a..73a3a94 100644 --- a/s390-tools.changes +++ b/s390-tools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 3 07:51:27 UTC 2025 - Nikolay Gueorguiev + +- Applied more additional patches (jsc#PED-11870, jec#PED-11958) + * s390-tools-08-rust-pvimg-Fix-flag-parsing-for-allowing-dump.patch + * s390-tools-09-rust-pvimg-Document-the-change-from--comm-key-to--cck.patch + ------------------------------------------------------------------- Thu Jan 30 08:19:47 UTC 2025 - Nikolay Gueorguiev diff --git a/s390-tools.spec b/s390-tools.spec index 6bff6a6..3995bc5 100644 --- a/s390-tools.spec +++ b/s390-tools.spec @@ -188,6 +188,8 @@ Patch973: s390-tools-04-zkey-Add-the-pvsecrets-import-command.patch Patch974: s390-tools-05-zkey-Reject-key-generation-and-APQN-association-for-PVSECRET-AES-keys.patch Patch975: s390-tools-06-zkey-Reject-re-enciphering-of-PVSECRET-AES-keys.patch Patch976: s390-tools-07-zkey-Support-validation-of-key-of-type-PVSECRET-AES.patch +Patch977: s390-tools-08-rust-pvimg-Fix-flag-parsing-for-allowing-dump.patch +Patch978: s390-tools-09-rust-pvimg-Document-the-change-from--comm-key-to--cck.patch ### Patch990: s390-tools-slfo-01-parse-ipl-device-for-activation.patch ###