diff --git a/0580-check_for_CONFIG_ACPI_TABLE_UPGRADE.patch b/0580-check_for_CONFIG_ACPI_TABLE_UPGRADE.patch new file mode 100644 index 0000000..1b37ea4 --- /dev/null +++ b/0580-check_for_CONFIG_ACPI_TABLE_UPGRADE.patch @@ -0,0 +1,27 @@ +From: Harald Hoyer +Subject: check for CONFIG_ACPI_TABLE_UPGRADE +References: bsc#1098448 +Patch-Mainline: 046 +Git-commit: 940169e8d8e500498a3f350b2b3f341ae6548492 +Git-repo: https://github.com/dracutdevs/dracut.git + +additionally as for CONFIG_ACPI_INITRD_TABLE_OVERRIDE +config parameter got renamed + +Signed-off-by: Thomas Renninger + +Index: dracut-044/dracut.sh +=================================================================== +--- dracut-044.orig/dracut.sh 2018-06-20 17:43:56.664313292 +0200 ++++ dracut-044/dracut.sh 2018-06-20 17:43:57.488359175 +0200 +@@ -1046,8 +1046,8 @@ if [[ ! $print_cmdline ]]; then + fi + fi + +-if [[ $acpi_override = yes ]] && ! check_kernel_config CONFIG_ACPI_INITRD_TABLE_OVERRIDE; then +- dwarn "Disabling ACPI override, because kernel does not support it. CONFIG_ACPI_INITRD_TABLE_OVERRIDE!=y" ++if [[ $acpi_override = yes ]] && ! ( check_kernel_config CONFIG_ACPI_TABLE_UPGRADE || check_kernel_config CONFIG_ACPI_INITRD_TABLE_OVERRIDE ); then ++ dwarn "Disabling ACPI override, because kernel does not support it. CONFIG_ACPI_INITRD_TABLE_OVERRIDE!=y or CONFIG_ACPI_TABLE_UPGRADE!=y" + unset acpi_override + fi + diff --git a/dracut.changes b/dracut.changes index a361367..055929c 100644 --- a/dracut.changes +++ b/dracut.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jun 20 15:44:35 UTC 2018 - trenn@suse.de + +- Add fix to override ACPI tables via initrd, a kernel config variable + changed name (bsc#1098448) + This is mainline git commit 940169e8d8e500498a3f350b2b3f341ae6548492 +A 0580-check_for_CONFIG_ACPI_TABLE_UPGRADE.patch + ------------------------------------------------------------------- Thu Jun 14 12:26:02 UTC 2018 - daniel.molkentin@suse.com diff --git a/dracut.spec b/dracut.spec index 9c9780b..b19a78f 100644 --- a/dracut.spec +++ b/dracut.spec @@ -401,6 +401,8 @@ Patch571: 0571-40network-Fix-static-network-setup.patch Patch572: 0572-lsinitrd-no-more-cat-write-error-Broken-pipe.patch # Patch adopted from upstream commit 8379784a0e8e38b85f36cb605a323dce02fd76b5 Patch573: 0573-lsinitrd.sh-quote-filename-in-extract_files.patch +# Patch adopted from upstream commit 940169e8d8e500498a3f350b2b3f341ae6548492 +Patch580: 0580-check_for_CONFIG_ACPI_TABLE_UPGRADE.patch BuildRequires: asciidoc BuildRequires: bash @@ -697,6 +699,7 @@ chmod a+x modules.d/95qeth_rules/module-setup.sh %patch571 -p1 %patch572 -p1 %patch573 -p1 +%patch580 -p1 %build %configure\