rpm/ignition
SHA256
1
0
Fork 0
forked from pool/ignition
Code Pull Requests Activity

Accepting request 1070759 from devel:kubic:ignition

Browse Source 
- Add `dasd_mod.dasd=autodetect` to kernel command line parameters
  (for Ignition device support on S/390) [boo#1207903]
- Fix S/390 build in 0001-ignore-missing-qemu-blockdev.patch

OBS-URL: https://build.opensuse.org/request/show/1070759
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ignition?expand=0&rev=38
This commit is contained in:
Dominique Leuenberger 2023-03-12 15:22:23 +00:00 committed by Git OBS Bridge
commit dbcb6bc24a
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
0001-ignore-missing-qemu-blockdev.patch
View File

@ -17,13 +17,20 @@ diff --git a/internal/providers/qemu/qemu_blockdev.go b/internal/providers/qemu/
index 911eb973..11739f3e 100644 index 911eb973..11739f3e 100644
--- a/internal/providers/qemu/qemu_blockdev.go --- a/internal/providers/qemu/qemu_blockdev.go
+++ b/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 return nil, err
} }
case <-time.After(blockDeviceTimeout): case <-time.After(blockDeviceTimeout):
- return nil, fmt.Errorf("timed out after %v waiting for block device %q to appear", blockDeviceTimeout, ignitionBlockDevicePath) - 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) + 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 return bytes.TrimRight(data, "\x00"), nil

2
02_ignition_firstboot
View File

@ -20,5 +20,5 @@ if ! [ -f "${flagpath}/firstboot_happened" ]; then
source "${flagpath}/ignition.firstboot" source "${flagpath}/ignition.firstboot"
fi fi
set ignition_firstboot="ignition.firstboot $ignition_network_kcmdline" set ignition_firstboot="ignition.firstboot dasd_mod.dasd=autodetect $ignition_network_kcmdline"
fi fi

6
ignition.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Mar 9 17:55:16 UTC 2023 - Ignaz Forster <iforster@suse.com>
- 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 Mon Feb 27 13:09:37 UTC 2023 - iforster@suse.com