Ignition.cfg -> 05_ignition.cfg rename

0001-Rename-ignition.cfg-05_ignition.cfg.patch

@@ -0,0 +1,49 @@
+From 8db6a73a353aee31ac07a60c09c1d8a749f3234e Mon Sep 17 00:00:00 2001
+From: Etienne Champetier <e.champetier@ateme.com>
+Date: Mon, 17 Mar 2025 14:52:48 -0400
+Subject: [PATCH] Rename ignition.cfg -> 05_ignition.cfg
+
+When bootupd/grub2-static/configs.d was introduced,
+blscfg was after every config. Some config need to be after blscfg,
+so rename to 05_ignition.cfg so we can align bootupd numbering with
+legacy grub (blscfg is in 10_linux).
+---
+ Makefile                                | 2 +-
+ docs/release-notes.md                   | 2 ++
+ grub2/{ignition.cfg => 05_ignition.cfg} | 0
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+ rename grub2/{ignition.cfg => 05_ignition.cfg} (100%)
+
+diff --git a/Makefile b/Makefile
+index 635b809f..2f3ed33c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -33,7 +33,7 @@ install: all
+ 	ln -sf ../lib/dracut/modules.d/30ignition/ignition $(DESTDIR)/usr/libexec/ignition-rmcfg
+ 
+ install-grub-for-bootupd:
+-	install -m 0644 -D -t $(DESTDIR)/usr/lib/bootupd/grub2-static/configs.d grub2/ignition.cfg
++	install -m 0644 -D -t $(DESTDIR)/usr/lib/bootupd/grub2-static/configs.d grub2/05_ignition.cfg
+ 
+ .PHONY: vendor
+ vendor:
+diff --git a/docs/release-notes.md b/docs/release-notes.md
+index 6829e671..ec3c1aa7 100644
+--- a/docs/release-notes.md
++++ b/docs/release-notes.md
+@@ -12,6 +12,8 @@ nav_order: 9
+ 
+ ### Changes
+ 
++- Rename ignition.cfg -> 05_ignition.cfg
++
+ ### Bug fixes
+ 
+ 
+diff --git a/grub2/ignition.cfg b/grub2/05_ignition.cfg
+similarity index 100%
+rename from grub2/ignition.cfg
+rename to grub2/05_ignition.cfg
+-- 
+2.48.1
+

ignition.spec

@@ -37,6 +37,8 @@ Source1:        https://github.com/fedora-iot/ignition-edge/archive/%{ignedgecom
 # For vendored gdisk
 Source2:        http://downloads.sourceforge.net/gptfdisk/gptfdisk-%{gdiskversion}.tar.gz
 
+Patch0: 0001-Rename-ignition.cfg-05_ignition.cfg.patch
+
 BuildRequires: libblkid-devel
 BuildRequires: systemd-rpm-macros
 
@@ -224,6 +226,19 @@ It is only used for building release binaries to be signed by Fedora release
 engineering and uploaded to the Ignition GitHub releases page.
 %endif
 
+
+############## grub subpackage ##############
+
+%package grub
+Summary:  Enablement glue for bootupd's grub2 config
+License:  Apache-2.0
+
+# `ignition-grub` is a rename `ignition-ignition-grub` so let's obsolete `ignition-ignition-grub`
+Obsoletes: ignition-ignition-grub
+
+%description grub
+This package contains the grub2 config which is compatable with bootupd.
+
 ############## ignition-edge subpackage ##############
 
 %package edge
@@ -235,16 +250,6 @@ License:  Apache-2.0
 This package contains dracut modules, services and binaries needed to enable
 Ignition on IoT/Edge systems.
 
-############## ignition-grub subpackage ##############
-
-%package ignition-grub
-
-Summary:  Enablement glue for bootupd's grub2 config 
-License:  Apache-2.0
-
-%description ignition-grub
-This package contains the grub2 config which is compatable with bootupd.
-
 %prep
 %if 0%{?fedora}
 %goprep -k
@@ -278,7 +283,7 @@ echo "Building ignition..."
 echo "Building ignition-validate..."
 %gobuild -o ./ignition-validate validate/main.go
 
-%global gocrossbuild go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x
+%global gocrossbuild go build -ldflags "${LDFLAGS:-} -B 0x$(cat /dev/urandom | tr -d -c '0-9a-f' | head -c16)" -a -v -x
 
 %if 0%{?fedora}
 echo "Building statically-linked Linux ignition-validate..."
@@ -310,9 +315,9 @@ install -m 0755 -d %{buildroot}/%{_libexecdir}
 ln -sf ../lib/dracut/modules.d/30ignition/ignition %{buildroot}/%{_libexecdir}/ignition-apply
 ln -sf ../lib/dracut/modules.d/30ignition/ignition %{buildroot}/%{_libexecdir}/ignition-rmcfg
 
-# ignition-grub
-install -d -p %{buildroot}%{_libdir}/bootupd/grub2-static/configs.d
-install -p -m 0644 grub2/ignition.cfg  %{buildroot}%{_libdir}/bootupd/grub2-static/configs.d/
+# grub
+install -d -p %{buildroot}%{_prefix}/lib/bootupd/grub2-static/configs.d
+install -p -m 0644 grub2/05_ignition.cfg  %{buildroot}%{_prefix}/lib/bootupd/grub2-static/configs.d/
 
 # ignition
 install -d -p %{buildroot}%{_bindir}
@@ -390,10 +395,10 @@ install -D -p -m 644 COPYING %{buildroot}%{_datadir}/licenses/gdisk/COPYING
 %{_libexecdir}/coreos-ignition-write-issues
 %{_libexecdir}/coreos-check-ssh-keys
 
-%files ignition-grub
+%files grub
 %doc README.md
 %license %{golicenses}
-%{_libdir}/bootupd/grub2-static/configs.d/ignition.cfg
+%{_prefix}/lib/bootupd/grub2-static/configs.d/05_ignition.cfg
 
 %changelog
 %autochangelog