diff --git a/0001-ignore-missing-qemu-blockdev.patch b/0001-ignore-missing-qemu-blockdev.patch index 39ebb0f..b35fd53 100644 --- a/0001-ignore-missing-qemu-blockdev.patch +++ b/0001-ignore-missing-qemu-blockdev.patch @@ -17,13 +17,20 @@ 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) { +@@ -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 } 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 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