[PATCH 1/5] Generate a name if necessary when reconfiguring a factory device. (#1009941)
David Lehman
dlehman at redhat.com
Mon Oct 14 17:44:19 UTC 2013
---
blivet/devicefactory.py | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/blivet/devicefactory.py b/blivet/devicefactory.py
index 627819f..924dab6 100644
--- a/blivet/devicefactory.py
+++ b/blivet/devicefactory.py
@@ -647,8 +647,11 @@ class DeviceFactory(object):
parent_container.addMember(self.device)
def _set_name(self):
- if self.device_name is None:
- return
+ if not self.device_name:
+ self.device_name = self.storage.suggestDeviceName(
+ parent=self.container,
+ swap=(self.fstype == "swap"),
+ mountpoint=self.mountpoint)
# TODO: write a StorageDevice.name setter
safe_new_name = self.storage.safeDeviceName(self.device_name)
@@ -1204,8 +1207,11 @@ class LVMFactory(DeviceFactory):
return self.storage.newLV(*args, **kwargs)
def _set_name(self):
- if self.device_name is None:
- return
+ if not self.device_name:
+ self.device_name = self.storage.suggestDeviceName(
+ parent=self.container,
+ swap=(self.fstype == "swap"),
+ mountpoint=self.mountpoint)
# TODO: write a StorageDevice.name setter
lvname = "%s-%s" % (self.container.name, self.device_name)
@@ -1629,7 +1635,4 @@ class BTRFSFactory(DeviceFactory):
def _set_name(self):
super(BTRFSFactory, self)._set_name()
- if self.device_name is None:
- return
-
self.device.format.options = "subvol=" + self.device.name
--
1.8.1.4
More information about the anaconda-patches
mailing list