51 lines
1.7 KiB
Diff
51 lines
1.7 KiB
Diff
From 491a49ff9aedf5197af3e4dcb0f50351db3cddf0 Mon Sep 17 00:00:00 2001
|
|
From: David Cantrell <david.l.cantrell@gmail.com>
|
|
Date: Thu, 18 Jan 2018 15:20:18 -0500
|
|
Subject: [PATCH] Remove get_modules().
|
|
|
|
This kickstart command has been deprecated for a long time anyway and it
|
|
has been removed in pykickstart 3.9.
|
|
---
|
|
imgcreate/kickstart.py | 15 ---------------
|
|
imgcreate/live.py | 1 -
|
|
2 files changed, 16 deletions(-)
|
|
|
|
diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
|
|
index e7997ca..7d92b5b 100644
|
|
--- a/imgcreate/kickstart.py
|
|
+++ b/imgcreate/kickstart.py
|
|
@@ -533,21 +533,6 @@ def get_image_fstype(ks, default = None):
|
|
return p.fstype
|
|
return default
|
|
|
|
-def get_modules(ks):
|
|
- devices = []
|
|
- if not hasattr(ks.handler.device, "deviceList"):
|
|
- devices.append(ks.handler.device)
|
|
- else:
|
|
- devices.extend(ks.handler.device.deviceList)
|
|
-
|
|
- modules = []
|
|
- for device in devices:
|
|
- if not device.moduleName:
|
|
- continue
|
|
- modules.extend(device.moduleName.split(":"))
|
|
-
|
|
- return modules
|
|
-
|
|
def get_timeout(ks, default = None):
|
|
if not hasattr(ks.handler.bootloader, "timeout"):
|
|
return default
|
|
diff --git a/imgcreate/live.py b/imgcreate/live.py
|
|
index 1f332dd..b3da184 100755
|
|
--- a/imgcreate/live.py
|
|
+++ b/imgcreate/live.py
|
|
@@ -90,7 +90,6 @@ def __init__(self, ks, name, fslabel=None, releasever=None, tmpdir="/tmp",
|
|
"=mmc", "=pcmcia", "mptsas", "udf", "virtio_blk",
|
|
"virtio_pci", "virtio_scsi", "virtio_net", "virtio_mmio",
|
|
"virtio_balloon", "virtio-rng"]
|
|
- self.__modules.extend(kickstart.get_modules(self.ks))
|
|
|
|
self._isofstype = "iso9660"
|
|
self.base_on = False
|