Accepting request 1294836 from devel:kubic:ignition

- Update to version 2.22.0:
  * Features
    * Support Oracle Cloud Infrastructure
  * Changes
    * Rename ignition.cfg -> 05_ignition.cfg
    * Support setting setuid/setgid/sticky mode bits (3.6.0-exp)
    * Warn if setuid/setgid/sticky mode bits specified (3.4.0 - 3.5.0)
    * Add initial TMT tests and a new workflow to execute tests on PRs

OBS-URL: https://build.opensuse.org/request/show/1294836
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ignition?expand=0&rev=51

0002-allow-multiple-mounts-of-same-device.patch

@@ -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 (
  )
  

_service

@@ -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.22.0</param>
+    <param name="revision">v2.22.0</param>
     <param name="url">https://github.com/coreos/ignition</param>
     <param name="scm">git</param>
     <param name="changesgenerate">enable</param>

_servicedata

@@ -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">687a3e7fce01ce9d09eafb6abc1d0a141e51ef35</param>
  </service>
 </servicedata>

ignition-2.22.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:293d73dd3d04015fbcb40b4c248109b562c3b5f2eb073365291fc831b2404a83
+size 4525748

ignition-kargs-helper

@@ -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#*=}"

ignition-mount-initrd-fstab.service

@@ -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)'

ignition-suse-generator

@@ -1,6 +1,4 @@
 #!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
 
 set -e
 
@@ -42,12 +40,24 @@ add_requires ignition-umount-initrd-fstab.service ignition-files.service
 add_requires ignition-enable-network.service ignition-fetch.service
 
 if [ -z "${PLATFORM_ID}" ]; then
-    platform="$(systemd-detect-virt || true)"
-    case "${platform}" in
-        *vmware*)     platform="vmware" ;;
-        *oracle*)     platform="virtualbox" ;;
-        *kvm*|*qemu*) platform="qemu" ;;
-        *)            platform="metal" ;;
+    platform="metal"
+    detectedvirt="$(systemd-detect-virt || true)"
+    case "${detectedvirt}" in
+       *vmware*)
+            if modinfo -F name vmw_vsock_virtio_transport >/dev/null; then
+                platform="vmware"
+            fi
+            ;;
+        *oracle*)
+            if modinfo -F name vboxguest >/dev/null; then
+                platform="virtualbox"
+            fi
+            ;;
+        *kvm*|*qemu*)
+            if modinfo -F name qemu_fw_cfg >/dev/null; then
+                platform="qemu"
+            fi
+            ;;
     esac
     echo "PLATFORM_ID=${platform}" > /run/ignition.env
 fi

ignition-umount-initrd-fstab.service

@@ -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)'

ignition.changes

@@ -1,3 +1,56 @@
+-------------------------------------------------------------------
+Mon Jul 21 12:56:07 UTC 2025 - Ignaz Forster <iforster@suse.com>
+
+- Update to version 2.22.0:
+  * Features
+    * Support Oracle Cloud Infrastructure
+  * Changes
+    * Rename ignition.cfg -> 05_ignition.cfg
+    * Support setting setuid/setgid/sticky mode bits (3.6.0-exp)
+    * Warn if setuid/setgid/sticky mode bits specified (3.4.0 -
+      3.5.0)
+    * Add initial TMT tests and a new workflow to execute tests on
+      PRs
+
+-------------------------------------------------------------------
+Mon Jun 30 14:08:02 UTC 2025 - Ignaz Forster <iforster@suse.com>
+
+- ignition-suse-generator: Only use Ignition platform ID when
+  the corresponding kernel modules are found
+  [bsc#1234315] [boo#1230668] [gh#coreos/ignition#1984]
+
+-------------------------------------------------------------------
+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>
 

ignition.spec

@@ -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.22.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

module-setup.sh

@@ -41,7 +41,7 @@ install() {
         "/usr/sbin/ignition-enable-network"
     inst_script "$moddir/ignition-setup-user.sh" \
         "/usr/sbin/ignition-setup-user"
-    inst_multiple awk systemd-detect-virt cryptsetup
+    inst_multiple awk systemd-detect-virt cryptsetup modinfo
     install_ignition_unit ignition-remove-reconfig_system.service initrd.target
     install_ignition_unit ignition-setup-user.service
 }