Re: [rhinstaller/blivet/pulls/348 master] Installer isolation: part
one
by dashea
> @@ -1465,176 +1470,22 @@ def _update_custom_storage_ksdata(self):
> parent = getattr(self.ksdata, list_attr)
> parent.dataList().append(data)
>
> - self.fsset = FSSet(self.devicetree)
> + self.config = StorageDiscoveryConfig()
> + self.autopart_type = AUTOPART_TYPE_LVM
>
> - def reset(self, cleanup_only=False):
> - Blivet.reset(self, cleanup_only)
> + self.__luks_devs = {}
>
> + # these will both be empty until our reset method gets called
> + # instantiate our own devicetree here to override the default created
> + # in Blivet so that protected_dev_specs gets handled
> + self.devicetree = DeviceTree(passphrase=self.encryption_passphrase,
> + luks_dict=self.__luks_devs,
> + ignored_disks=self.ignored_disks,
> + exclusive_disks=self.exclusive_disks,
> + disk_images=self.disk_images,
> + protected_dev_specs=self.config.protected_dev_specs)
Right; now that I will be able to test again, I'll do the protected device handling changes and push those with my next PR. Same with the super().reset call.
--
To view this pull request on github, visit https://github.com/rhinstaller/blivet/pull/348#discussion_r57933466
8 years, 2 months
Re: [rhinstaller/blivet/pulls/348 master] Installer isolation: part
one
by dashea
> @@ -1465,176 +1470,22 @@ def _update_custom_storage_ksdata(self):
> parent = getattr(self.ksdata, list_attr)
> parent.dataList().append(data)
>
> - self.fsset = FSSet(self.devicetree)
> + self.config = StorageDiscoveryConfig()
> + self.autopart_type = AUTOPART_TYPE_LVM
>
> - def reset(self, cleanup_only=False):
> - Blivet.reset(self, cleanup_only)
> + self.__luks_devs = {}
>
> + # these will both be empty until our reset method gets called
> + # instantiate our own devicetree here to override the default created
> + # in Blivet so that protected_dev_specs gets handled
> + self.devicetree = DeviceTree(passphrase=self.encryption_passphrase,
> + luks_dict=self.__luks_devs,
> + ignored_disks=self.ignored_disks,
> + exclusive_disks=self.exclusive_disks,
> + disk_images=self.disk_images,
> + protected_dev_specs=self.config.protected_dev_specs)
We talked about moving the protected device handling out of `DeviceTree` completely, since all we do there is set a simple attribute (`device.protected`) anyway.
We also talked about refactoring such that `InstallerSorage.reset` include a call to `super().reset(cleanup_only=cleanup_only)` instead of duplicating that code.
As far as `Blivet` having its own configuration class/instance, I do like the idea of reducing clutter somewhat, but I'm not sure it's warranted just for ignored_disks, exclusive_disks, and disk_images.
--
To view this pull request on github, visit https://github.com/rhinstaller/blivet/pull/348#discussion_r57914159
8 years, 2 months
[PATCH rhel7-branch] network: copy static routes configured in installer to system (#1255801)
by Radek Vykydal
Resolves: rhbz#1255801
---
pyanaconda/network.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/network.py b/pyanaconda/network.py
index 5d8e6c3..4f440a2 100644
--- a/pyanaconda/network.py
+++ b/pyanaconda/network.py
@@ -1003,11 +1003,12 @@ def copyFileToPath(fileName, destPath='', overwrite=False):
# /etc/sysconfig/network-scripts/ifcfg-*
# /etc/sysconfig/network-scripts/keys-*
-# TODO: routing info from /etc/sysconfig/network-scripts?
+# static routes
+# /etc/sysconfig/network-scripts/route-*
def copyIfcfgFiles(destPath):
files = os.listdir(netscriptsDir)
for cfgFile in files:
- if cfgFile.startswith(("ifcfg-","keys-")):
+ if cfgFile.startswith(("ifcfg-","keys-", "route-")):
srcfile = os.path.join(netscriptsDir, cfgFile)
copyFileToPath(srcfile, destPath)
--
2.4.3
8 years, 2 months
[PATCH] Don't provide subclasses of the multipath or dmraid commands.
by Chris Lumens
These have been deprecated in pykickstart and don't do anything in
anaconda anyway.
---
pyanaconda/kickstart.py | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 5ac0d34..7e80164 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -1115,14 +1115,6 @@ class Network(commands.network.F24_Network):
def execute(self, storage, ksdata, instClass):
network.write_network_config(storage, ksdata, instClass, iutil.getSysroot())
-class MultiPath(commands.multipath.FC6_MultiPath):
- def parse(self, args):
- raise NotImplementedError(_("The %s kickstart command is not currently supported.") % "multipath")
-
-class DmRaid(commands.dmraid.FC6_DmRaid):
- def parse(self, args):
- raise NotImplementedError(_("The %s kickstart command is not currently supported.") % "dmraid")
-
class Partition(commands.partition.F23_Partition):
def execute(self, storage, ksdata, instClass):
for p in self.partitions:
@@ -1963,7 +1955,6 @@ commandMap = {
"btrfs": BTRFS,
"bootloader": Bootloader,
"clearpart": ClearPart,
- "dmraid": DmRaid,
"eula": Eula,
"fcoe": Fcoe,
"firewall": Firewall,
@@ -1976,7 +1967,6 @@ commandMap = {
"lang": Lang,
"logging": Logging,
"logvol": LogVol,
- "multipath": MultiPath,
"network": Network,
"part": Partition,
"partition": Partition,
--
2.4.3
8 years, 2 months