[PATCH rhel7-branch] Use the RHEL7 versions of certain partitioning commands.

Vratislav Podzimek vpodzime at redhat.com
Fri Jun 19 14:57:25 UTC 2015


On Fri, 2015-06-19 at 10:07 -0400, Chris Lumens wrote:
> With the changes to pykickstart for supporting --mkfsoptions, we need to
> make sure anaconda is using the latest versions of those commands.  This
> does not add support to anaconda for the --mkfsoptions argument, it merely
> allows tests to continue passing.
> 
> Related: rhbz#1217110
> ---
>  pyanaconda/kickstart.py | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
> index d587976..5cccb5e 100644
> --- a/pyanaconda/kickstart.py
> +++ b/pyanaconda/kickstart.py
> @@ -423,12 +423,12 @@ class Bootloader(commands.bootloader.RHEL7_Bootloader):
>          if self.nombr:
>              flags.nombr = True
>  
> -class BTRFS(commands.btrfs.F17_BTRFS):
> +class BTRFS(commands.btrfs.RHEL7_BTRFS):
>      def execute(self, storage, ksdata, instClass):
>          for b in self.btrfsList:
>              b.execute(storage, ksdata, instClass)
>  
> -class BTRFSData(commands.btrfs.F17_BTRFSData):
> +class BTRFSData(commands.btrfs.RHEL7_BTRFSData):
>      def execute(self, storage, ksdata, instClass):
>          devicetree = storage.devicetree
>  
> @@ -1067,7 +1067,7 @@ 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.F20_Partition):
> +class Partition(commands.partition.RHEL7_Partition):
>      def execute(self, storage, ksdata, instClass):
>          for p in self.partitions:
>              p.execute(storage, ksdata, instClass)
> @@ -1075,7 +1075,7 @@ class Partition(commands.partition.F20_Partition):
>          if self.partitions:
>              doPartitioning(storage)
>  
> -class PartitionData(commands.partition.F18_PartData):
> +class PartitionData(commands.partition.RHEL7_PartData):
>      def execute(self, storage, ksdata, instClass):
>          devicetree = storage.devicetree
>          kwargs = {}
> @@ -1336,12 +1336,12 @@ class PartitionData(commands.partition.F18_PartData):
>                                       parents=request)
>              storage.createDevice(luksdev)
>  
> -class Raid(commands.raid.F20_Raid):
> +class Raid(commands.raid.RHEL7_Raid):
>      def execute(self, storage, ksdata, instClass):
>          for r in self.raidList:
>              r.execute(storage, ksdata, instClass)
>  
> -class RaidData(commands.raid.F18_RaidData):
> +class RaidData(commands.raid.RHEL7_RaidData):
>      def execute(self, storage, ksdata, instClass):
>          raidmems = []
>          devicetree = storage.devicetree
ACK.

-- 
Vratislav Podzimek

Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic



More information about the anaconda-patches mailing list