Djam/calamares
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/calamares.git synced 2025-02-23 23:52:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add yet another patch from upstream to fix bug #1154

Browse source
This commit is contained in:
tpg (Tomasz Paweł Gajc) 2015-04-01 20:16:59 +02:00
parent 105913557a
commit d7c6a9535b
2 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
0002-Make-sure-we-write-the-kernel-config-line-anyway.patch Normal file
View file

@ -0,0 +1,33 @@
From a8b1154470ce543e77a4e2e0d139b5e42a4cb21e Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Wed, 1 Apr 2015 15:50:13 +0200
Subject: [PATCH] Make sure we write the kernel config line anyway.
---
src/modules/grubcfg/main.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py
index b6d06d0..eef731b 100644
--- a/src/modules/grubcfg/main.py
+++ b/src/modules/grubcfg/main.py
@@ -87,7 +87,7 @@ def modify_grub_default(partitions, root_mount_point, distributor):
for existing_param in existing_params:
existing_param_name = existing_param.split("=")[0]
- if existing_param_name not in ["quiet", "resume", "splash"]: #the only ones we ever add
+ if existing_param_name not in ["quiet", "resume", "splash"]: # the only ones we ever add
kernel_params.append(existing_param)
kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"{!s}\"".format(" ".join(kernel_params))
@@ -110,6 +110,7 @@ def modify_grub_default(partitions, root_mount_point, distributor):
lines.append("{!s}=\"{!s}\"".format(key, escaped_value))
if not have_kernel_cmd:
+ kernel_cmd = "GRUB_CMDLINE_LINUX_DEFAULT=\"{!s}\"".format(" ".join(kernel_params))
lines.append(kernel_cmd)
if not have_distributor_line:
--
1.9.0

3
calamares.spec
View file

@ -8,7 +8,7 @@
Summary: Distribution-independent installer framework
Name: calamares
Version: 1.0.0
Release: 0.%{calamdate}.2
Release: 0.%{calamdate}.3
Group: System/Configuration/Other
License: GPLv3+
URL: http://calamares.io/
@ -40,6 +40,7 @@ Source100: OpenMandriva-adverts.tar.xz
Patch1: calamares-0.17.0-20150112-openmandriva-desktop-file.patch
# (tpg) potential fix https://issues.openmandriva.org/show_bug.cgi?id=1154
Patch2: 0001-Preserve-kernel-parameters-that-aren-t-handled-by-gr.patch
Patch3: 0002-Make-sure-we-write-the-kernel-config-line-anyway.patch
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Xml)