From d6c7cb870729d46b330ef05d9681aed371d99e5a954100f3681927091e7e5b4a Mon Sep 17 00:00:00 2001 From: Ignaz Forster Date: Thu, 9 Mar 2023 17:57:32 +0000 Subject: [PATCH 1/3] - Add `dasd_mod.dasd=autodetect` to kernel command line parameters (for Ignition device support on S/390) [boo#1207903] OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=104 --- 02_ignition_firstboot | 2 +- ignition.changes | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/02_ignition_firstboot b/02_ignition_firstboot index 952f3e9..fe18989 100644 --- a/02_ignition_firstboot +++ b/02_ignition_firstboot @@ -20,5 +20,5 @@ if ! [ -f "${flagpath}/firstboot_happened" ]; then source "${flagpath}/ignition.firstboot" fi - set ignition_firstboot="ignition.firstboot $ignition_network_kcmdline" + set ignition_firstboot="ignition.firstboot dasd_mod.dasd=autodetect $ignition_network_kcmdline" fi diff --git a/ignition.changes b/ignition.changes index 04fe0a7..57a2c6c 100644 --- a/ignition.changes +++ b/ignition.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 9 17:55:16 UTC 2023 - Ignaz Forster + +- Add `dasd_mod.dasd=autodetect` to kernel command line parameters + (for Ignition device support on S/390) [boo#1207903] + ------------------------------------------------------------------- Mon Feb 27 13:09:37 UTC 2023 - iforster@suse.com From bf78bb8c5f295316616e3fa7a5c69fbd5fa72c688d5d054240d8ff396bdbd8b2 Mon Sep 17 00:00:00 2001 From: Ignaz Forster Date: Fri, 10 Mar 2023 15:04:09 +0000 Subject: [PATCH 2/3] Fix 0001-ignore-missing-qemu-blockdev.patch OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=105 --- 0001-ignore-missing-qemu-blockdev.patch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/0001-ignore-missing-qemu-blockdev.patch b/0001-ignore-missing-qemu-blockdev.patch index 39ebb0f..909a218 100644 --- a/0001-ignore-missing-qemu-blockdev.patch +++ b/0001-ignore-missing-qemu-blockdev.patch @@ -17,13 +17,12 @@ diff --git a/internal/providers/qemu/qemu_blockdev.go b/internal/providers/qemu/ index 911eb973..11739f3e 100644 --- a/internal/providers/qemu/qemu_blockdev.go +++ b/internal/providers/qemu/qemu_blockdev.go -@@ -83,7 +83,8 @@ func fetchConfigFromBlockDevice(logger *log.Logger) ([]byte, error) { +@@ -83,7 +83,7 @@ func fetchConfigFromBlockDevice(logger *log.Logger) ([]byte, error) { return nil, err } case <-time.After(blockDeviceTimeout): - return nil, fmt.Errorf("timed out after %v waiting for block device %q to appear", blockDeviceTimeout, ignitionBlockDevicePath) + logger.Info("timed out after %v waiting for block device %q to appear. Ignoring...", blockDeviceTimeout, ignitionBlockDevicePath) -+ return util.ParseConfig(logger, []byte{}) } return bytes.TrimRight(data, "\x00"), nil From ff89f29290c2bf68dc4bb5630c308df2c33e666dca1a539522c0968c7e6bef97 Mon Sep 17 00:00:00 2001 From: Ignaz Forster Date: Fri, 10 Mar 2023 15:36:17 +0000 Subject: [PATCH 3/3] Remove unused import in 0001-ignore-missing-qemu-blockdev.patch OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=106 --- 0001-ignore-missing-qemu-blockdev.patch | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/0001-ignore-missing-qemu-blockdev.patch b/0001-ignore-missing-qemu-blockdev.patch index 909a218..b35fd53 100644 --- a/0001-ignore-missing-qemu-blockdev.patch +++ b/0001-ignore-missing-qemu-blockdev.patch @@ -17,6 +17,14 @@ diff --git a/internal/providers/qemu/qemu_blockdev.go b/internal/providers/qemu/ index 911eb973..11739f3e 100644 --- a/internal/providers/qemu/qemu_blockdev.go +++ b/internal/providers/qemu/qemu_blockdev.go +@@ -22,7 +22,6 @@ package qemu + + import ( + "bytes" +- "fmt" + "os" + "os/exec" + "time" @@ -83,7 +83,7 @@ func fetchConfigFromBlockDevice(logger *log.Logger) ([]byte, error) { return nil, err }