[blivet] Require cryptsetup instead of cryptsetup-luks (#969597)

mulhern amulhern at redhat.com
Thu Nov 7 22:15:59 UTC 2013


Resolves: fed#969597

cryptsetup-luks was an independent package but now is provided by the
cryptsetup package; therefore it is the cryptsetup package that should
be required in the spec file and elsewhere.

Signed-off-by: mulhern <amulhern at redhat.com>
---
 blivet/devices.py      | 2 +-
 blivet/formats/luks.py | 2 +-
 python-blivet.spec     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/blivet/devices.py b/blivet/devices.py
index d620eaf..2e678ab 100644
--- a/blivet/devices.py
+++ b/blivet/devices.py
@@ -1989,7 +1989,7 @@ class DMCryptDevice(DMDevice):
 class LUKSDevice(DMCryptDevice):
     """ A mapped LUKS device. """
     _type = "luks/dm-crypt"
-    _packages = ["cryptsetup-luks"]
+    _packages = ["cryptsetup"]
 
     def __init__(self, name, format=None, size=None, uuid=None,
                  exists=False, sysfsPath='', parents=None):
diff --git a/blivet/formats/luks.py b/blivet/formats/luks.py
index 0c4b25b..fef464a 100644
--- a/blivet/formats/luks.py
+++ b/blivet/formats/luks.py
@@ -51,7 +51,7 @@ class LUKS(DeviceFormat):
     _formattable = True                 # can be formatted
     _supported = False                  # is supported
     _linuxNative = True                 # for clearpart
-    _packages = ["cryptsetup-luks"]     # required packages
+    _packages = ["cryptsetup"]          # required packages
 
     def __init__(self, *args, **kwargs):
         """ Create a LUKS instance.
diff --git a/python-blivet.spec b/python-blivet.spec
index e104f86..ff246eb 100644
--- a/python-blivet.spec
+++ b/python-blivet.spec
@@ -29,7 +29,7 @@ Requires: util-linux >= %{utillinuxver}
 Requires: parted >= %{partedver}
 Requires: pyparted >= %{pypartedver}
 Requires: device-mapper >= %{dmver}
-Requires: cryptsetup-luks
+Requires: cryptsetup
 Requires: python-cryptsetup >= %{pythoncryptsetupver}
 Requires: mdadm
 Requires: lvm2
-- 
1.8.3.1



More information about the anaconda-patches mailing list