diff --git a/modify-coreos-rootflags-to-fix-nestos-install-problem.patch b/modify-coreos-rootflags-to-fix-nestos-install-problem.patch new file mode 100644 index 0000000..2ad1884 --- /dev/null +++ b/modify-coreos-rootflags-to-fix-nestos-install-problem.patch @@ -0,0 +1,33 @@ +From bc132afdd2554d0ae2b3c4d4ef56a676870fc5cf Mon Sep 17 00:00:00 2001 +From: duyiwei +Date: Fri, 22 Sep 2023 09:37:16 +0800 +Subject: [PATCH] modify coreos-rootflags to fix nestos install problem + +Signed-off-by: duyiwei +--- + src/bin/rdcore/rootmap.rs | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/bin/rdcore/rootmap.rs b/src/bin/rdcore/rootmap.rs +index fbe85b3..7c404c9 100644 +--- a/src/bin/rdcore/rootmap.rs ++++ b/src/bin/rdcore/rootmap.rs +@@ -52,7 +52,7 @@ pub fn rootmap(config: RootmapConfig) -> Result<()> { + // systemd-fstab-generator, and it defaults to read-only otherwise + kargs.push("rw".into()); + +- let rootflags = runcmd_output!("coreos-rootflags", &config.root_mount)?; ++ let rootflags = runcmd_output!("nestos-rootflags", &config.root_mount)?; + let rootflags = rootflags.trim(); + if !rootflags.is_empty() { + kargs.push(format!("rootflags={}", rootflags)); +@@ -292,4 +292,4 @@ fn write_boot_uuid_grub2_dropin>(uuid: &str, p: P) -> Result<()> + let p = p.as_ref(); + std::fs::write(p, format!("set BOOT_UUID=\"{}\"\n", uuid)) + .with_context(|| format!("writing {}", p.display())) +-} +\ No newline at end of file ++} +-- +2.33.0 + diff --git a/nestos-installer.spec b/nestos-installer.spec index 7d491dd..5fb8e15 100644 --- a/nestos-installer.spec +++ b/nestos-installer.spec @@ -9,7 +9,7 @@ Name: rust-nestos-installer Version: 0.16.0 -Release: 3 +Release: 4 Summary: Installer for NestOS License: Apache-2.0 @@ -17,6 +17,7 @@ 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 +Patch02: modify-coreos-rootflags-to-fix-nestos-install-problem.patch BuildRequires: rust-packaging openssl-devel zstd-devel BuildRequires: systemd @@ -109,6 +110,9 @@ This subpackage contains boot-time infrastructure for NestOS. It is not needed %changelog +* Fri Sep 22 2023 duyiwei7w - 0.16.0-4 +- modify-coreos-rootflags-to-fix-nestos-install-problem + * Thu Dec 15 2022 dingdingaaaaa - 0.16.0-3 - License compliance rectification