From 0ee47ccf942f13b153b0182de30766dc57ef813d Mon Sep 17 00:00:00 2001 From: fu-shanqing Date: Tue, 23 Aug 2022 10:02:32 +0800 Subject: [PATCH] fix 'nestos-installer iso' command error --- fix-nestos-installer-iso-command-error.patch | 12 ++++++++++++ nestos-installer.spec | 7 +++++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 fix-nestos-installer-iso-command-error.patch diff --git a/fix-nestos-installer-iso-command-error.patch b/fix-nestos-installer-iso-command-error.patch new file mode 100644 index 0000000..d6c8fa5 --- /dev/null +++ b/fix-nestos-installer-iso-command-error.patch @@ -0,0 +1,12 @@ +--- nestos-installer-v0.14.0/src/iso9660.rs 2022-06-14 16:41:41.000000000 +0800 ++++ nestos-installer-v0.14.0-new/src/iso9660.rs 2022-08-23 13:42:03.469259308 +0800 +@@ -120,6 +120,9 @@ impl IsoFs { + .with_context(|| format!("listing directory {}", dir.name))? + { + let record = record?; ++ if name == "OPENEULER"{ ++ return Ok(Some(record)) ++ } + match &record { + DirectoryRecord::Directory(d) if d.name == name => return Ok(Some(record)), + DirectoryRecord::File(f) if f.name == name => return Ok(Some(record)), diff --git a/nestos-installer.spec b/nestos-installer.spec index 62e00ad..3c0a5bd 100644 --- a/nestos-installer.spec +++ b/nestos-installer.spec @@ -10,7 +10,7 @@ Name: rust-nestos-installer Version: 0.14.0 -Release: 1 +Release: 2 Summary: Installer for NestOS # Upstream license specification: Apache-2.0 @@ -18,7 +18,7 @@ License: ASL 2.0 URL: https://gitee.com/openeuler/nestos-installer Source0: https://gitee.com/openeuler/nestos-installer/repository/archive/v%{version}.tar.gz Source1: %{crate}-%{version}-vendor.tar.gz - +Patch01: fix-nestos-installer-iso-command-error.patch BuildRequires: rust-packaging openssl-devel BuildRequires: systemd @@ -110,6 +110,9 @@ This subpackage contains boot-time infrastructure for NestOS. It is not needed %changelog +* Tue Aug 23 2022 fushanqing - 0.14.0-2 +- fix 'nestos-installer iso' command error + * Mon Jun 13 2022 duyiwei - 0.14.0-1 - upgrade to 0.14.0