[dev-python/python-blivet] version bump to 1.0.10, required by Anaconda 22

2016-06-12 14:50:25 +02:00
parent 3d77aec3c9
commit 37bf380103
7 changed files with 188 additions and 2 deletions
@@ -0,0 +1,80 @@
+From 629da74f22048a618ce76fc88b6cb26cb45241a4 Mon Sep 17 00:00:00 2001
+From: Fabio Erculiani <lxnay@sabayon.org>
+Date: Sun, 12 Jun 2016 14:44:59 +0200
+Subject: [PATCH 1/3] Update package names to reflect Gentoo ones
+
+---
+ blivet/devices/disk.py | 6 +++---
+ blivet/devices/nfs.py  | 2 +-
+ blivet/formats/fs.py   | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/blivet/devices/disk.py b/blivet/devices/disk.py
+index 8192e04..f5aaad2 100644
+--- a/blivet/devices/disk.py
+++ b/blivet/devices/disk.py
+@@ -248,7 +248,7 @@ class DMRaidArrayDevice(DMDevice, ContainerDevice):
+ class MultipathDevice(DMDevice):
+     """ A multipath device """
+     _type = "dm-multipath"
+-    _packages = ["device-mapper-multipath"]
+    _packages = ["multipath-tools"]
+     _services = ["multipathd"]
+     _partitionable = True
+     _isDisk = True
+@@ -341,7 +341,7 @@ class MultipathDevice(DMDevice):
+ class iScsiDiskDevice(DiskDevice, NetworkStorageDevice):
+     """ An iSCSI disk. """
+     _type = "iscsi"
+-    _packages = ["iscsi-initiator-utils", "dracut-network"]
+    _packages = ["open-iscsi"]
+ 
+     def __init__(self, device, **kwargs):
+         """
+@@ -429,7 +429,7 @@ class iScsiDiskDevice(DiskDevice, NetworkStorageDevice):
+ class FcoeDiskDevice(DiskDevice, NetworkStorageDevice):
+     """ An FCoE disk. """
+     _type = "fcoe"
+-    _packages = ["fcoe-utils", "dracut-network"]
+    _packages = ["fcoe-utils"]
+ 
+     def __init__(self, device, **kwargs):
+         """
+diff --git a/blivet/devices/nfs.py b/blivet/devices/nfs.py
+index 513a11c..947ed06 100644
+--- a/blivet/devices/nfs.py
+++ b/blivet/devices/nfs.py
+@@ -30,7 +30,7 @@ from .network import NetworkStorageDevice
+ class NFSDevice(StorageDevice, NetworkStorageDevice):
+     """ An NFS device """
+     _type = "nfs"
+-    _packages = ["dracut-network"]
+    _packages = []
+ 
+     def __init__(self, device, fmt=None, parents=None):
+         """
+diff --git a/blivet/formats/fs.py b/blivet/formats/fs.py
+index 681ff04..b1816a0 100644
+--- a/blivet/formats/fs.py
+++ b/blivet/formats/fs.py
+@@ -1230,7 +1230,7 @@ class ReiserFS(FS):
+     _linuxNative = True
+     _dump = True
+     _check = True
+-    _packages = ["reiserfs-utils"]
+    _packages = ["reiserfsprogs"]
+     _infofs = "debugreiserfs"
+     _existingSizeFields = ["Count of blocks on the device:", "Blocksize:"]
+     partedSystem = fileSystemType["reiserfs"]
+@@ -1319,7 +1319,7 @@ class HFSPlus(FS):
+     _udevTypes = ["hfsplus"]
+     _mkfs = "mkfs.hfsplus"
+     _fsck = "fsck.hfsplus"
+-    _packages = ["hfsplus-tools"]
+    _packages = ["hfsutils"]
+     _labelfs = fslabeling.HFSPlusLabeling()
+     _formattable = True
+     _mountType = "hfsplus"
+-- 
+2.7.4
+
@@ -0,0 +1,28 @@
+From 29bf499b8681d883cc95ed0c542db012a895ce99 Mon Sep 17 00:00:00 2001
+From: Fabio Erculiani <lxnay@sabayon.org>
+Date: Sun, 12 Jun 2016 14:46:17 +0200
+Subject: [PATCH 2/3] devices: enable UUID= for dm-based devices in fstab
+
+---
+ blivet/devices/dm.py | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/blivet/devices/dm.py b/blivet/devices/dm.py
+index ca4dd15..f2e3a48 100644
+--- a/blivet/devices/dm.py
+++ b/blivet/devices/dm.py
+@@ -84,11 +84,6 @@ class DMDevice(StorageDevice):
+         return d
+ 
+     @property
+-    def fstabSpec(self):
+-        """ Return the device specifier for use in /etc/fstab. """
+-        return self.path
+-
+-    @property
+     def mapName(self):
+         """ This device's device-mapper map name """
+         return self.name
+-- 
+2.7.4
+
@@ -0,0 +1,24 @@
+From 1ae0b66f870e2c1bb97d8034544c4f1f46aeb2dd Mon Sep 17 00:00:00 2001
+From: Fabio Erculiani <lxnay@sabayon.org>
+Date: Sun, 12 Jun 2016 14:47:46 +0200
+Subject: [PATCH 3/3] Call udev.settle() when committing to disk.
+
+---
+ blivet/formats/disklabel.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/blivet/formats/disklabel.py b/blivet/formats/disklabel.py
+index ed42bef..676de82 100644
+--- a/blivet/formats/disklabel.py
+++ b/blivet/formats/disklabel.py
+@@ -283,6 +283,7 @@ class DiskLabel(DeviceFormat):
+             raise DiskLabelCommitError(msg)
+         else:
+             self.updateOrigPartedDisk()
+            udev.settle()
+ 
+     def addPartition(self, start, end, ptype=None):
+         """ Add a partition to the disklabel.
+-- 
+2.7.4
+