From 5d659f051e07c3d9c9bc455c61ea684d7dab3b77 Mon Sep 17 00:00:00 2001 From: t_feng Date: Mon, 9 Mar 2020 21:25:40 +0800 Subject: [PATCH] add boot options for dummy --- anaconda.spec | 9 ++++++++- huawei-add-boot-options-for-dummy.patch | 25 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 huawei-add-boot-options-for-dummy.patch diff --git a/anaconda.spec b/anaconda.spec index 110d45f..0d2ba55 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -3,7 +3,7 @@ Name: anaconda Version: 29.24.7 -Release: 27 +Release: 28 Summary: Graphical system installer License: GPLv2+ and MIT URL: https://fedoraproject.org/wiki/Anaconda @@ -49,6 +49,7 @@ Patch9031: bugfix-setup-fail-in-decode.patch Patch9032: anaconda-modify-default-timezone-and-zh_CN_po.patch Patch9033: bugfix-modify-network-hostname-dot-illegal.patch Patch9034: backport-Remove-initThreading-method-from-pyanaconda-threading.patch +Patch9035: huawei-add-boot-options-for-dummy.patch BuildRequires: audit-libs-devel libtool gettext-devel >= 0.19.8 gtk3-devel >= 3.22.17 BuildRequires: gtk-doc gtk3-devel-docs >= 3.22.17 glib2-doc gobject-introspection-devel @@ -221,6 +222,12 @@ update-desktop-database &> /dev/null || : %{_datadir}/gtk-doc %changelog +* Mon Mar 9 2020 openEuler Buildteam - 29.24.7-28 +- Type:bugfix +- Id:NA +- SUG:NA +- DESC:add boot options for dummy + * Wed Feb 12 2020 openEuler Buildteam - 29.24.7-27 - Type:bugfix - Id:NA diff --git a/huawei-add-boot-options-for-dummy.patch b/huawei-add-boot-options-for-dummy.patch new file mode 100644 index 0000000..2b6edf5 --- /dev/null +++ b/huawei-add-boot-options-for-dummy.patch @@ -0,0 +1,25 @@ +From 66f30776cdb79ccb26be01ad9cd2e1712fc0170c Mon Sep 17 00:00:00 2001 +From: fengtao +Date: Mon, 9 Mar 2020 21:19:07 +0800 +Subject: [PATCH] add boot options for dummy + +--- + pyanaconda/bootloader.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py +index 0fe5dd2..f539454 100644 +--- a/pyanaconda/bootloader.py ++++ b/pyanaconda/bootloader.py +@@ -1537,7 +1537,7 @@ class GRUB2(GRUB): + if blivet.arch.is_aarch64(): + log.info("check boot args:%s",arg_str) + arg_str=re.sub("console=[a-zA-Z0-9,]*","",arg_str) +- arg_str+=" smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 crashkernel=1024M,high" ++ arg_str+=" smmu.bypassdev=0x1000:0x17 smmu.bypassdev=0x1000:0x15 crashkernel=1024M,high video=efifb:off video=VGA-1:640x480-32@60me" + else: + arg_str+=" quiet crashkernel=512M" + +-- +1.8.3.1 +