summaryrefslogtreecommitdiffstats
path: root/storage
diff options
context:
space:
mode:
authorDavid Lehman <dlehman@redhat.com>2010-02-15 18:13:07 -0600
committerDavid Lehman <dlehman@redhat.com>2010-02-16 09:20:58 -0600
commitb415bb6857fce1cb4ce2f728a55de3699cd37d07 (patch)
treee81c2156e5f4dc6b5aa3ba5d05b2c31065a9cd59 /storage
parentae2dc7328d757471a4ed41f98f58e5c937b47b75 (diff)
downloadanaconda-b415bb6857fce1cb4ce2f728a55de3699cd37d07.tar.gz
anaconda-b415bb6857fce1cb4ce2f728a55de3699cd37d07.tar.xz
anaconda-b415bb6857fce1cb4ce2f728a55de3699cd37d07.zip
Show the correct device path when formatting as swap or luks.
Diffstat (limited to 'storage')
-rw-r--r--storage/formats/luks.py3
-rw-r--r--storage/formats/swap.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/storage/formats/luks.py b/storage/formats/luks.py
index ea3e3d240..b164f14d1 100644
--- a/storage/formats/luks.py
+++ b/storage/formats/luks.py
@@ -192,7 +192,8 @@ class LUKS(DeviceFormat):
w = None
if intf:
w = intf.waitWindow(_("Formatting"),
- _("Encrypting %s") % (self.device,))
+ _("Encrypting %s") % kwargs.get("device",
+ self.device))
try:
DeviceFormat.create(self, *args, **kwargs)
diff --git a/storage/formats/swap.py b/storage/formats/swap.py
index f7538c213..362f6d585 100644
--- a/storage/formats/swap.py
+++ b/storage/formats/swap.py
@@ -160,7 +160,8 @@ class SwapSpace(DeviceFormat):
if intf:
w = intf.progressWindow(_("Formatting"),
_("Creating %s on %s")
- % (self.type, self.device),
+ % (self.type,
+ kwargs.get("device", self.device)),
100, pulse = True)
try: