Update to anaconda-29.24.7

0001-anaconda-add-Qubes-installclass.patch → 0001-add-Qubes-installclass.patch

@@ -1,23 +1,19 @@
-From aef23d6edb86739638cdaf08e7892683681392b1 Mon Sep 17 00:00:00 2001
+From 52527e5a60b1b1f174226c85c5671dffa0891cbd Mon Sep 17 00:00:00 2001
 From: Tomasz Sterna <tomek@xiaoka.com>
 Date: Fri, 19 Oct 2018 08:02:11 +0200
-Subject: [PATCH] anaconda: add Qubes installclass
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
+Subject: [PATCH] add Qubes installclass
 
-Signed-off-by: Frédéric Pierret <frederic.epitre@orange.fr>
 ---
- pyanaconda/installclasses/qubes.py | 93 ++++++++++++++++++++++++++++++++++++++
- 1 file changed, 93 insertions(+)
+ pyanaconda/installclasses/qubes.py | 70 ++++++++++++++++++++++++++++++
+ 1 file changed, 70 insertions(+)
  create mode 100644 pyanaconda/installclasses/qubes.py
 
 diff --git a/pyanaconda/installclasses/qubes.py b/pyanaconda/installclasses/qubes.py
 new file mode 100644
-index 000000000..e98912b63
+index 000000000..84afaf046
 --- /dev/null
 +++ b/pyanaconda/installclasses/qubes.py
-@@ -0,0 +1,93 @@
+@@ -0,0 +1,70 @@
 +#
 +# qubes.py
 +#
@@ -37,18 +33,14 @@ index 000000000..e98912b63
 +# along with this program. If not, see <http://www.gnu.org/licenses/>.
 +#
 +
-+
 +from pyanaconda.installclass import BaseInstallClass
-+from pyanaconda.constants import *
 +from pyanaconda.product import *
-+from pyanaconda import network
-+from pyanaconda.i18n import N_
-+import os, types
-+import blivet.platform
++from pyanaconda.core.i18n import N_
++import pyanaconda.platform
 +
 +from blivet.size import Size
-+from blivet.platform import platform
-+from decimal import Decimal
++from pyanaconda.platform import platform
++
 +
 +class InstallClass(BaseInstallClass):
 + # name has underscore used for mnemonics, strip if you dont need it
@@ -66,51 +58,32 @@ index 000000000..e98912b63
 +
 + bootloaderTimeoutDefault = 5
 +
-+ tasks = [(N_("Minimal"), ["base", "base-x", "kde-desktop-qubes", "qubes" ]) ]
++ tasks = [(N_("Minimal"), ["base", "base-x", "qubes"])]
 +
 + help_placeholder = "QubesPlaceholder.html"
 + help_placeholder_with_links = "QubesPlaceholderWithLinks.html"
 +
-+ def getPackagePaths(self, uri):
-+ if not type(uri) == types.ListType:
-+ uri = [uri,]
-+
-+ return {'Installation Repo': uri}
-+
 + def configure(self, anaconda):
 + BaseInstallClass.configure(self, anaconda)
 + self.setDefaultPartitioning(anaconda.storage)
 +
 + def setDefaultPartitioning(self, storage):
-+ BaseInstallClass.setDefaultPartitioning(self,
-+ storage)
-+ for autoreq in list(storage.autopart_requests):
++ BaseInstallClass.setDefaultPartitioning(self, storage)
++ for autoreq in storage.autopart_requests:
 + if autoreq.mountpoint == "/":
-+ autoreq.max_size=None
-+ autoreq.required_space=Size("10GiB")
++ autoreq.max_size = None
++ autoreq.required_space = Size("10GiB")
 + if autoreq.mountpoint == "/home":
 + storage.autopart_requests.remove(autoreq)
 + if autoreq.mountpoint == "/boot/efi":
-+ autoreq.max_size=Size("500MiB")
++ autoreq.max_size = Size("500MiB")
 + if autoreq.mountpoint == "/boot" and \
-+ isinstance(platform, blivet.platform.EFI):
++ isinstance(platform, pyanaconda.platform.EFI):
 + # xen.efi don't need /boot
 + storage.autopart_requests.remove(autoreq)
 +
-+ def productMatches(self, oldprod):
-+ if oldprod is None:
-+ return False
-+
-+ if oldprod.startswith(productName):
-+ return True
-+
-+ return False
-+
-+ def versionMatches(self, oldver):
-+ return True
-+
 + def __init__(self):
 + BaseInstallClass.__init__(self)
 -- 
-2.14.4
+2.17.2
 

0002-anaconda-add-Qubes-post-scripts.patch → 0002-add-Qubes-post-scripts.patch

@@ -1,12 +1,8 @@
-From 0cb13168feb3dfd4b9510c89ed3bc005a23795ca Mon Sep 17 00:00:00 2001
+From 9a7550ffb0523a28b2076e286f84cb843c21843c Mon Sep 17 00:00:00 2001
 From: Tomasz Sterna <tomek@xiaoka.com>
 Date: Fri, 19 Oct 2018 08:02:11 +0200
-Subject: [PATCH] anaconda: add Qubes post-scripts
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
+Subject: [PATCH] add Qubes post-scripts
 
-Signed-off-by: Frédéric Pierret <frederic.epitre@orange.fr>
 ---
  data/post-scripts/40-qubes-alt-kernels.ks | 20 ++++++++++++++++++++
  data/post-scripts/50-qubes.ks | 5 +++++
@@ -85,5 +81,5 @@ index 7d78d4bc3..ad2f6497d 100644
 +dist_postscripts_DATA = 40-qubes-alt-kernels.ks 50-qubes.ks 60-systemd-preset.ks 80-setfilecons.ks 90-copy-screenshots.ks 99-copy-logs.ks
  MAINTAINERCLEANFILES = Makefile.in
 -- 
-2.14.4
+2.17.2