diff --git a/.gitignore b/.gitignore index 7079af7..9fabce7 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,5 @@ /coreos-installer-0.24.0-vendor.tar.gz /coreos-installer-0.25.0.crate /coreos-installer-0.25.0-vendor.tar.gz +/coreos-installer-0.26.0.crate +/coreos-installer-0.26.0-vendor.tar.gz diff --git a/0001-install-check-if-firstboot-args-are-defined-and-add-.patch b/0001-install-check-if-firstboot-args-are-defined-and-add-.patch deleted file mode 100644 index 24d641a..0000000 --- a/0001-install-check-if-firstboot-args-are-defined-and-add-.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a5b314f36ef805f6581c408abc4e9607a2f2ad04 Mon Sep 17 00:00:00 2001 -From: yasminvalim -Date: Mon, 13 Oct 2025 10:44:55 -0300 -Subject: [PATCH 1/2] install: check if firstboot args are defined and add them - manually if necessary - -(cherry picked from commit f43c6ad77841761b5f2386bb670664fe18184efb) ---- - src/cmdline/install.rs | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/cmdline/install.rs b/src/cmdline/install.rs -index 885ca73..206d602 100644 ---- a/src/cmdline/install.rs -+++ b/src/cmdline/install.rs -@@ -272,7 +272,7 @@ impl InstallConfig { - return Ok(self); - } - -- let args = self -+ let mut args = self - .config_file - .iter() - .map(|path| { -@@ -295,6 +295,12 @@ impl InstallConfig { - ) - .collect::>(); - -+ // If firstboot-args is defined, add it manually -+ if let Some(firstboot_args) = &self.firstboot_args { -+ args.push("--firstboot-args".to_string()); -+ args.push(firstboot_args.clone()); -+ } -+ - println!("Running with arguments: {}", args.join(" ")); - Self::from_args(&args) - } --- -2.51.1 - diff --git a/0002-install-add-unit-tests.patch b/0002-install-add-unit-tests.patch deleted file mode 100644 index af9bf1e..0000000 --- a/0002-install-add-unit-tests.patch +++ /dev/null @@ -1,48 +0,0 @@ -From dbf43bbc22bc6f4e873d442ca537e25d2288cb0f Mon Sep 17 00:00:00 2001 -From: yasminvalim -Date: Mon, 13 Oct 2025 11:42:48 -0300 -Subject: [PATCH 2/2] install: add unit tests - -(cherry picked from commit 26094bf552f5ddf3fec974c1f7e7b468bbe4b9e6) ---- - src/cmdline/install.rs | 26 ++++++++++++++++++++++++++ - 1 file changed, 26 insertions(+) - -diff --git a/src/cmdline/install.rs b/src/cmdline/install.rs -index 206d602..915db59 100644 ---- a/src/cmdline/install.rs -+++ b/src/cmdline/install.rs -@@ -584,4 +584,30 @@ dest-device: u - .expand_config_files() - .unwrap_err(); - } -+ -+ /// Test that firstboot-args is manually added to args list when defined -+ #[test] -+ fn test_firstboot_args_manually_added() { -+ let mut f = NamedTempFile::new().unwrap(); -+ f.as_file_mut().write_all(b"dest-device: /dev/sda").unwrap(); -+ -+ let config = InstallConfig::from_args(&[ -+ "--config-file", -+ f.path().to_str().unwrap(), -+ "--firstboot-args", -+ "ip=dhcp", -+ ]) -+ .unwrap(); -+ -+ // Verify firstboot-args is defined -+ assert!(config.firstboot_args.is_some()); -+ assert_eq!(config.firstboot_args.as_ref().unwrap(), "ip=dhcp"); -+ -+ // Test expand_config_files to verify manual addition -+ let expanded = config.expand_config_files().unwrap(); -+ -+ // Should still have firstboot-args -+ assert!(expanded.firstboot_args.is_some()); -+ assert_eq!(expanded.firstboot_args.unwrap(), "ip=dhcp"); -+ } - } --- -2.51.1 - diff --git a/rust-coreos-installer.spec b/rust-coreos-installer.spec index 7f70dd6..55e54d4 100644 --- a/rust-coreos-installer.spec +++ b/rust-coreos-installer.spec @@ -11,8 +11,8 @@ %global crate coreos-installer Name: rust-%{crate} -Version: 0.25.0 -Release: 2%{?dist} +Version: 0.26.0 +Release: 1%{?dist} Summary: Installer for Fedora CoreOS and RHEL CoreOS # Upstream license specification: Apache-2.0 @@ -23,10 +23,6 @@ Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{ Source1: https://github.com/coreos/%{crate}/releases/download/v%{version}/%{crate}-%{version}-vendor.tar.gz Source2: https://github.com/coreos/coreos-installer-dracut/archive/%{dracutcommit}/coreos-installer-dracut-%{dracutshortcommit}.tar.gz -# https://github.com/coreos/coreos-installer/pull/1699 -Patch0: 0001-install-check-if-firstboot-args-are-defined-and-add-.patch -Patch1: 0002-install-add-unit-tests.patch - ExclusiveArch: %{rust_arches} %if 0%{?rhel} && !0%{?eln} BuildRequires: rust-toolset @@ -177,6 +173,9 @@ from the initramfs. %endif %changelog +* Tue Mar 10 2026 Yasmin de Souza - 0.26.0-1 +- new version + * Fri Oct 24 2025 Aashish Radhakrishnan - 0.25.0-1 - New upstream release diff --git a/sources b/sources index 94d6676..ef5edaa 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (coreos-installer-0.25.0.crate) = 39ee5582b91e7d940d2ac5f7b36b7f4113a1db625db155291928660a81f96a124afdde9781f552dfb2bc71931f91189b344ee7d1b5c5175e10d8fd45935da8e8 -SHA512 (coreos-installer-0.25.0-vendor.tar.gz) = 4d039c5dd77cc337123de46fbf06c819848d6570eeda6201e3fb1f7afd7e2915b96761c594360ff9b93430637b545d92363190e1150a37d4f5277b042fdf35b8 +SHA512 (coreos-installer-0.26.0.crate) = 642e562812f6923b22cb7888f71d3e23f574fb046c76f42165e4c6c4820557a94ae87fd0f0e2ec170eee1299f3b46db0ebe4957c8b4650654bfaf7b37d838489 +SHA512 (coreos-installer-0.26.0-vendor.tar.gz) = b5022b7440bfb7f59beadd451753dca65e68678757dd76e51789ed593992bd60f8eb1b37b07fe91b1473c1b900960a06e661a3c8c050165f9bf89bafde1857f0 SHA512 (coreos-installer-dracut-7181733.tar.gz) = a03e3e90f355690eda974335e2189c69837f7f0ceb456a449b2de6ce4b24ca098d3f0ea51ddcab35ab354a5070e4b0525188dfbbff8056cfc62bbcdded10647c