66 lines
2.7 KiB
Diff
66 lines
2.7 KiB
Diff
|
From efeff13f25e049159c556d40511f953e25aa3dc5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
|
||
|
|
<marmarek@invisiblethingslab.com>
|
||
|
|
Date: Fri, 19 Oct 2018 08:02:12 +0200
|
||
|
|
Subject: [PATCH] anaconda: switch default partitioning scheme to LVM Thin
|
||
|
|
Provisioning
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
QubesOS/qubes-issues#2412
|
||
|
|
|
||
|
|
Signed-off-by: Frédéric Pierret <frederic.epitre@orange.fr>
|
||
|
|
---
|
||
|
|
pyanaconda/ui/gui/spokes/storage.py | 4 ++--
|
||
|
|
pyanaconda/ui/tui/spokes/storage.py | 4 ++--
|
||
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py
|
||
|
|
index 87a923657..7feda7db3 100644
|
||
|
|
--- a/pyanaconda/ui/gui/spokes/storage.py
|
||
|
|
+++ b/pyanaconda/ui/gui/spokes/storage.py
|
||
|
|
@@ -75,7 +75,7 @@ from pyanaconda import constants, iutil, isys
|
||
|
|
from pyanaconda.bootloader import BootLoaderError
|
||
|
|
from pyanaconda.storage_utils import on_disk_storage
|
||
|
|
|
||
|
|
-from pykickstart.constants import CLEARPART_TYPE_NONE, AUTOPART_TYPE_LVM
|
||
|
|
+from pykickstart.constants import CLEARPART_TYPE_NONE, AUTOPART_TYPE_LVM, AUTOPART_TYPE_LVM_THINP
|
||
|
|
from pykickstart.errors import KickstartParseError
|
||
|
|
|
||
|
|
import sys
|
||
|
|
@@ -553,7 +553,7 @@ class StorageSpoke(NormalSpoke, StorageChecker):
|
||
|
|
self.autopart = self.data.autopart.autopart
|
||
|
|
self.autoPartType = self.data.autopart.type
|
||
|
|
if self.autoPartType is None:
|
||
|
|
- self.autoPartType = AUTOPART_TYPE_LVM
|
||
|
|
+ self.autoPartType = AUTOPART_TYPE_LVM_THINP
|
||
|
|
self.encrypted = self.data.autopart.encrypted
|
||
|
|
self.passphrase = self.data.autopart.passphrase
|
||
|
|
|
||
|
|
diff --git a/pyanaconda/ui/tui/spokes/storage.py b/pyanaconda/ui/tui/spokes/storage.py
|
||
|
|
index fd6d7a505..d8ec992b9 100644
|
||
|
|
--- a/pyanaconda/ui/tui/spokes/storage.py
|
||
|
|
+++ b/pyanaconda/ui/tui/spokes/storage.py
|
||
|
|
@@ -42,7 +42,7 @@ from pyanaconda.constants_text import INPUT_PROCESSED
|
||
|
|
from pyanaconda.i18n import _, P_, N_, C_
|
||
|
|
from pyanaconda.bootloader import BootLoaderError
|
||
|
|
|
||
|
|
-from pykickstart.constants import CLEARPART_TYPE_ALL, CLEARPART_TYPE_LINUX, CLEARPART_TYPE_NONE, AUTOPART_TYPE_LVM
|
||
|
|
+from pykickstart.constants import CLEARPART_TYPE_ALL, CLEARPART_TYPE_LINUX, CLEARPART_TYPE_NONE, AUTOPART_TYPE_LVM, AUTOPART_TYPE_LVM_THINP
|
||
|
|
from pykickstart.errors import KickstartParseError
|
||
|
|
|
||
|
|
from collections import OrderedDict
|
||
|
|
@@ -351,7 +351,7 @@ class StorageSpoke(NormalTUISpoke):
|
||
|
|
self.data.clearpart.drives = self.selected_disks[:]
|
||
|
|
|
||
|
|
if self.data.autopart.type is None:
|
||
|
|
- self.data.autopart.type = AUTOPART_TYPE_LVM
|
||
|
|
+ self.data.autopart.type = AUTOPART_TYPE_LVM_THINP
|
||
|
|
|
||
|
|
if self.autopart:
|
||
|
|
self.clearPartType = CLEARPART_TYPE_ALL
|
||
|
|
--
|
||
|
|
2.14.4
|
||
|
|
|