SLFO-pool/ignition
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main ignition revision 36581abb7c424562607776ffbc8b9324

Browse Source
This commit is contained in:
Adrian Schröter
2025-06-25 11:46:30 +02:00
parent b98d47ba06
commit e10bfcf7a9
10 changed files with 73 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
0002-allow-multiple-mounts-of-same-device.patch
View File

@@ -6,10 +6,10 @@ Upstream: Ticket opened [gh#coreos/ignition#890]
e.g. to mount several subvolumes from a Btrfs device or bind mounting
the device to multiple places, by also adding the path to the key.
Index: ignition-2.16.2/config/v3_1/types/filesystem.go
Index: ignition-2.20.0/config/v3_1/types/filesystem.go
===================================================================
--- ignition-2.16.2.orig/config/v3_1/types/filesystem.go
+++ ignition-2.16.2/config/v3_1/types/filesystem.go
--- ignition-2.20.0.orig/config/v3_1/types/filesystem.go
+++ ignition-2.20.0/config/v3_1/types/filesystem.go
@@ -23,6 +23,9 @@ import (
)
@@ -20,10 +20,10 @@ Index: ignition-2.16.2/config/v3_1/types/filesystem.go
return f.Device
}
Index: ignition-2.16.2/config/v3_2/types/filesystem.go
Index: ignition-2.20.0/config/v3_2/types/filesystem.go
===================================================================
--- ignition-2.16.2.orig/config/v3_2/types/filesystem.go
+++ ignition-2.16.2/config/v3_2/types/filesystem.go
--- ignition-2.20.0.orig/config/v3_2/types/filesystem.go
+++ ignition-2.20.0/config/v3_2/types/filesystem.go
@@ -23,6 +23,9 @@ import (
)
@@ -34,10 +34,10 @@ Index: ignition-2.16.2/config/v3_2/types/filesystem.go
return f.Device
}
Index: ignition-2.16.2/config/v3_3/types/filesystem.go
Index: ignition-2.20.0/config/v3_3/types/filesystem.go
===================================================================
--- ignition-2.16.2.orig/config/v3_3/types/filesystem.go
+++ ignition-2.16.2/config/v3_3/types/filesystem.go
--- ignition-2.20.0.orig/config/v3_3/types/filesystem.go
+++ ignition-2.20.0/config/v3_3/types/filesystem.go
@@ -23,6 +23,9 @@ import (
)
@@ -48,10 +48,10 @@ Index: ignition-2.16.2/config/v3_3/types/filesystem.go
return f.Device
}
Index: ignition-2.16.2/config/v3_4/types/filesystem.go
Index: ignition-2.20.0/config/v3_4/types/filesystem.go
===================================================================
--- ignition-2.16.2.orig/config/v3_4/types/filesystem.go
+++ ignition-2.16.2/config/v3_4/types/filesystem.go
--- ignition-2.20.0.orig/config/v3_4/types/filesystem.go
+++ ignition-2.20.0/config/v3_4/types/filesystem.go
@@ -23,6 +23,9 @@ import (
)
@@ -62,10 +62,24 @@ Index: ignition-2.16.2/config/v3_4/types/filesystem.go
return f.Device
}
Index: ignition-2.16.2/config/v3_5_experimental/types/filesystem.go
Index: ignition-2.20.0/config/v3_5/types/filesystem.go
===================================================================
--- ignition-2.16.2.orig/config/v3_5_experimental/types/filesystem.go
+++ ignition-2.16.2/config/v3_5_experimental/types/filesystem.go
--- ignition-2.20.0.orig/config/v3_5/types/filesystem.go
+++ ignition-2.20.0/config/v3_5/types/filesystem.go
@@ -23,6 +23,9 @@ import (
)
func (f Filesystem) Key() string {
+ if (f.Path != nil) {
+ return f.Device + *f.Path
+ }
return f.Device
}
Index: ignition-2.20.0/config/v3_6_experimental/types/filesystem.go
===================================================================
--- ignition-2.20.0.orig/config/v3_6_experimental/types/filesystem.go
+++ ignition-2.20.0/config/v3_6_experimental/types/filesystem.go
@@ -23,6 +23,9 @@ import (
)

4
_service
View File

@@ -1,7 +1,7 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="version">2.19.0</param>
<param name="revision">v2.19.0</param>
<param name="version">2.21.0</param>
<param name="revision">v2.21.0</param>
<param name="url">https://github.com/coreos/ignition</param>
<param name="scm">git</param>
<param name="changesgenerate">enable</param>

2
_servicedata
View File

@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/coreos/ignition</param>
<param name="changesrevision">09c99e0305adc1377b87964a39ad2d009aec9b12</param>
<param name="changesrevision">fc324e12230b036ce9d44f64346780121431ff27</param>
</service>
</servicedata>

BIN
ignition-2.19.0.tar.xz LFS
View File

Binary file not shown.

BIN
ignition-2.21.0.tar.xz LFS Normal file
View File

Binary file not shown.

4
ignition-kargs-helper
View File

@@ -10,8 +10,8 @@ grubcfg="/sysroot/etc/default/grub"
# for us.
. /dracut-state.sh
mount "${root#block:}" "${NEWROOT}"
# Also mount x-initrd.mount flagged mounts to get the current /etc state
awk '$4 ~ /x-initrd.mount/ { system("findmnt /sysroot" $2 " >/dev/null || mount -t " $3 " -o " $4 " " $1 " /sysroot" $2) }' /sysroot/etc/fstab
# Mount x-initrd.mount flagged mounts, but skip the bind mount of the new nested subvolume based /etc
awk '$4 ~ /x-initrd.mount/ && ! ( $2 == "/etc" && $3 == "none" ) { system("findmnt /sysroot" $2 " >/dev/null || mount -t " $3 " -o " $4 " " $1 " /sysroot" $2) }' /sysroot/etc/fstab
orig_kernelopts="$(grep GRUB_CMDLINE_LINUX_DEFAULT "${grubcfg}")"
orig_kernelopts="${orig_kernelopts#*=}"

2
ignition-mount-initrd-fstab.service
View File

@@ -17,4 +17,4 @@ Before=ignition-files.service
[Service]
Type=oneshot
ExecStart=/bin/sh -e -c 'eval $(awk '"'"'$4 ~ /x-initrd.mount/ && $1 !~ /^#/ {print "if ! findmnt /sysroot" $2 " >/dev/null; then mount -t " $3 " -o " $4 " " $1 " /sysroot" $2 "; fi;" }'"'"' /sysroot/etc/fstab)'
ExecStart=/bin/sh -e -c 'eval $(awk '"'"'$4 ~ /x-initrd.mount/ && $1 !~ /^#/ && ! ( $2 == "/etc" && $3 == "none" ) {print "if ! findmnt /sysroot" $2 " >/dev/null; then mount -t " $3 " -o " $4 " " $1 " /sysroot" $2 "; fi;" }'"'"' /sysroot/etc/fstab)'

2
ignition-umount-initrd-fstab.service
View File

@@ -9,4 +9,4 @@ Before=initrd-parse-etc.service
[Service]
Type=oneshot
ExecStart=/bin/sh -e -c 'if [ -f /sysroot/etc/systemd/system-preset/20-ignition.preset ]; then while read line; do systemctl --root=/sysroot $line; done < /sysroot/etc/systemd/system-preset/20-ignition.preset; fi'
ExecStart=/bin/sh -e -c 'eval $(awk '"'"'$4 ~ /x-initrd.mount/ && $1 !~ /^#/ {print "if findmnt /sysroot" $2 " >/dev/null; then umount -R /sysroot" $2 "; fi;" }'"'"' /sysroot/etc/fstab)'
ExecStart=/bin/sh -e -c 'eval $(awk '"'"'$4 ~ /x-initrd.mount/ && $1 !~ /^#/ && ! ( $2 == "/etc" && $3 == "none" ) {print "if findmnt /sysroot" $2 " >/dev/null; then umount -R /sysroot" $2 "; fi;" }'"'"' /sysroot/etc/fstab)'

32
ignition.changes
View File

@@ -1,3 +1,35 @@
-------------------------------------------------------------------
Tue Apr 01 11:56:36 UTC 2025 - iforster@suse.com
- Update to version 2.21.0:
* Features
* Add Azure blob support for fetching ignition configs
* Add a check for ignition config in vendor-data (proxmoxve)
* Bug fixes
* Add pkey_cca kernel module to detect CEX domain for LUKS encryption
- Add support for nested /etc subvolume (t-u 5.0.0)
-------------------------------------------------------------------
Thu Nov 07 19:58:35 UTC 2024 - iforster@suse.com
- Update to version 2.20.0:
* Features
* Support partitioning disk with mounted partitions
* Support Proxmox VE
* Support gzipped Akamai user_data
* Changes
* The Dracut module now installs partx
* Mark the 3.5.0 config spec as stable
* No longer accept configs with version 3.5.0-experimental
* Create new 3.6.0-experimental config spec from 3.5.0
* Bug fixes
* Fix network race when phoning home on Equinix Metal
* Fix Akamai Ignition base64 decoding on padded payloads
* Fix Makefile GOARCH for loongarch64 (#1942)
- Drop go build bugfix again, fixed upstream
- Adapting 0002-allow-multiple-mounts-of-same-device.patch to new
3.6.0 spec
-------------------------------------------------------------------
Fri Aug 30 15:27:58 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>

5
ignition.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package ignition
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: ignition
Version: 2.19.0
Version: 2.21.0
Release: 0
Summary: First boot installer and configuration tool
License: Apache-2.0
@@ -94,7 +94,6 @@ cp %{SOURCE12} dracut/30ignition/ignition-kargs-helper.sh
%build
sed -i -e 's|go build -ldflags|go build -buildmode=pie -ldflags|g' build
sed -i -e '/go clean/d' build
VERSION=%{version} GLDFLAGS='-X github.com/coreos/ignition/v2/internal/distro.selinuxRelabel=false -X github.com/coreos/ignition/v2/internal/distro.writeAuthorizedKeysFragment=false ' ./build
%check