diff --git a/.python-blivet.metadata b/.python-blivet.metadata
index 5dd73a6..bcc0aaf 100644
--- a/.python-blivet.metadata
+++ b/.python-blivet.metadata
@@ -1 +1 @@
-4d717246866b111c86fde6c99d9aba48de6daf00 SOURCES/blivet-0.18.11.tar.gz
+0757e9d804574bb82949b16d8bd4a8c29b2d5c51 SOURCES/blivet-0.18.34.tar.gz
diff --git a/SPECS/python-blivet.spec b/SPECS/python-blivet.spec
index 6f861ff..dd4ca66 100644
--- a/SPECS/python-blivet.spec
+++ b/SPECS/python-blivet.spec
@@ -1,12 +1,12 @@
Summary: A python module for system storage configuration
Name: python-blivet
Url: http://fedoraproject.org/wiki/blivet
-Version: 0.18.11
+Version: 0.18.34
Release: 1%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
%define realname blivet
-Source0: http://git.fedorahosted.org/cgit/blivet.git/snapshot/%{realname}-%{version}.tar.gz
+Source0: http://github.com/dwlehman/blivet/archive/%{realname}-%{version}.tar.gz
# Versions of required components (done so we make sure the buildrequires
# match the requires versions of things).
@@ -18,6 +18,7 @@ Source0: http://git.fedorahosted.org/cgit/blivet.git/snapshot/%{realname}-%{vers
%define e2fsver 1.41.0
%define pythoncryptsetupver 0.1.1
%define utillinuxver 2.15.1
+%define lvm2ver 2.02.99
BuildArch: noarch
BuildRequires: gettext
@@ -32,7 +33,7 @@ Requires: device-mapper >= %{dmver}
Requires: cryptsetup-luks
Requires: python-cryptsetup >= %{pythoncryptsetupver}
Requires: mdadm
-Requires: lvm2
+Requires: lvm2 >= %{lvm2ver}
Requires: dosfstools
Requires: e2fsprogs >= %{e2fsver}
Requires: btrfs-progs
@@ -61,6 +62,311 @@ make DESTDIR=%{buildroot} install
%{python_sitelib}/*
%changelog
+* Fri Mar 21 2014 Brian C. Lane <bcl@redhat.com> - 0.18.34-1
+- Force removal of hidden devices (amulhern)
+ Resolves: rhbz#1078163
+
+* Tue Mar 18 2014 Brian C. Lane <bcl@redhat.com> - 0.18.33-1
+- fcoe: add sleep for dcbtool command (rvykydal)
+ Related: rhbz#1039223
+- Add a PE for LUKS metadata (bcl)
+ Resolves: rhbz#1076078
+
+* Fri Mar 07 2014 Brian C. Lane <bcl@redhat.com> - 0.18.32-1
+- Resolve md names in udev_resolve_devspec. (dlehman)
+ Related: rhbz#1047338
+- Fix an old typo in zeroing out a PReP partition. (dlehman)
+ Resolves: rhbz#1072781
+- Use container's parent's name for PV if available (vpodzime)
+ Resolves: rhbz#1065737
+- Limit the LV size to VG's free space size (vpodzime)
+ Related: rhbz#1072999
+- Only count with the extra metadata extents in new VGs and LVs (vpodzime)
+ Resolves: rhbz#1072999
+
+* Wed Mar 05 2014 Brian C. Lane <bcl@redhat.com> - 0.18.31-1
+- Fix traceback with write_dasd_conf. (sbueno+anaconda)
+ Resolves: rhbz#1072911
+
+* Tue Mar 04 2014 Brian C. Lane <bcl@redhat.com> - 0.18.30-1
+- When copying a root, also copy hidden devices (amulhern)
+ Related: rhbz#1043763
+- Add hidden flag to devicetree.getDeviceByID (amulhern)
+ Resolves: rhbz#1043763
+- Only set device for mountpoint if it is not None (amulhern)
+ Related: rhbz#1043763
+- Extend the list of things to be omitted if moddisk is False (amulhern)
+ Related: rhbz#1043763
+- Set req_name to None at the top of initializer (amulhern)
+ Related: rhbz#1043763
+- Log action cancelation (amulhern)
+ Resolves: rhbz#1043763
+- Make DeviceTree.hide() remove a larger set (amulhern)
+ Related: rhbz#1043763
+- Find more used devices when calculating unused devices (dlehman)
+ Related: rhbz#1043763
+- Re-write the DASD storage code. (sbueno+anaconda)
+ Resolves: rhbz#1001070
+- Include image install flag when updating from anaconda flags. (dlehman)
+ Resolves: rhbz#1066008
+
+* Wed Feb 26 2014 Brian C. Lane <bcl@redhat.com> - 0.18.29-1
+- Let the udev queue settle before populating the devicetree. (dlehman)
+ Resolves: rhbz#1049772
+- Allow use of a single path if multipath activation fails. (dlehman)
+ Resolves: rhbz#1054806
+
+* Tue Feb 25 2014 Brian C. Lane <bcl@redhat.com> - 0.18.28-1
+- Count with the extra metadata extents for RAID consistently (vpodzime)
+ Resolves: rhbz#1065737
+- Make partitioning error message more friendly (amulhern)
+ Resolves: rhbz#1020388
+
+* Fri Feb 21 2014 Brian C. Lane <bcl@redhat.com> - 0.18.27-1
+- Leave already-active devices up after destroying formatting. (dlehman)
+ Resolves: rhbz#1064898
+- Fix partition handling across multiple processActions calls. (dlehman)
+ Resolves: rhbz#1065522
+- return empty set when no matching fcoe nic (bcl)
+ Resolves: rhbz#1067159
+- Include tmpfs mounts in post-install kickstart (mkolman)
+ Resolves: rhbz#1061063
+
+* Wed Feb 19 2014 Brian C. Lane <bcl@redhat.com> - 0.18.26-1
+- Add a coverage test target (amulhern)
+ Resolves: rhbz#1064895
+- Disable tests in action_test.py (amulhern)
+ Resolves: rhbz#1065437
+- Fix some problems with action_test.py (amulhern)
+ Related: rhbz#1065437
+- Update tests/storagetestcase.py (amulhern)
+ Related: rhbz#1065437
+- Skip a test if device isn't available (amulhern)
+ Related: rhbz#1065431
+- Fix failing udev_test (amulhern)
+ Resolves: rhbz#1065431
+- Fix some size_test.py ERRORs (amulhern)
+ Resolves: rhbz#1065443
+- Filesystem labeling tests will not run without utilities (amulhern)
+ Resolves: rhbz#1065422
+- Rename misc_test.py to something more descriptive (amulhern)
+ Related: rhbz#1065422
+- Refactor labeling tests (amulhern)
+ Related: rhbz#1065422
+- Move SwapSpace tests into a separate class (amulhern)
+ Resolves: rhbz#1065422
+
+* Tue Feb 18 2014 Brian C. Lane <bcl@redhat.com> - 0.18.25-1
+- Wait for udev to create device node for new md arrays. (dlehman)
+ Resolves: rhbz#1036014
+- Fix detection of thin pool with non-standard segment types. (dlehman)
+ Resolves: rhbz#1029915
+- NFSDevice does not accept the exists kwarg. (dlehman)
+ Resolves: rhbz#1063413
+- Don't run mpathconf for disk image installations. (dlehman)
+ Resolves: rhbz#1066008
+
+* Tue Feb 11 2014 Brian C. Lane <bcl@redhat.com> - 0.18.24-1
+- Separate sanityCheck-ing from doAutoPartition (amulhern)
+ Related: rhbz#1060255
+- Change messages to SanityExceptions objects (amulhern)
+ Related: rhbz#1060255
+- Make a small SanityException hierarchy (amulhern)
+ Related: rhbz#1060255
+- Remove unused exception class (amulhern)
+ Related: rhbz#1060255
+- Add a test target to Makefile (amulhern)
+ Resolves: rhbz#1057665
+
+* Tue Feb 04 2014 Brian C. Lane <bcl@redhat.com> - 0.18.23-1
+- Remove all dependent devices of san device becoming multipath (rvykydal)
+ Resolves: rhbz#1058939
+- When repopulating multipath members mark them as multipath (rvykydal)
+ Resolves: rhbz#1056024
+- Don't add None value to req_disks (amulhern)
+ Resolves: rhbz#981316
+- Make error message more informative (amulhern)
+ Resolves: rhbz#1022497
+- fcoe: parse yet another sysfs structure for bnx2fc devices (rvykydal)
+ Related: rhbz#903122
+
+* Fri Jan 31 2014 Brian C. Lane <bcl@redhat.com> - 0.18.22-1
+- Check that file that loop device is going to use exists (amulhern)
+ Resolves: rhbz#982164
+ Related: rhbz#982164
+- Use os.path.isabs to check whether path name is absolute (amulhern)
+ Resolves: rhbz#994488
+ Related: rhbz#994488
+
+* Tue Jan 28 2014 Brian C. Lane <bcl@redhat.com> - 0.18.21-1
+- escrow: make sure the output directory exists (wwoods)
+ Resolves: rhbz#1026653
+
+* Mon Jan 27 2014 David Lehman <dlehman@redhat.com> - 0.18.20-1
+- Tell lvcreate not to ask us any questions and do its job. (dlehman)
+ Resolves: rhbz#1057066
+- Some simple tests for _verifyLUKSDevicesHaveKey (amulhern)
+ Related: rhbz#1023442
+ Resolves: rhbz#1023442
+- Verify that LUKS devices have some encryption key (amulhern)
+ Resolves: rhbz#1023442
+- Make the maximum end sector for PReP boot more benevolent (vpodzime)
+ Resolves: rhbz#1041535
+
+* Wed Jan 22 2014 Brian C. Lane <bcl@redhat.com> - 0.18.19-1
+- Only do SELinux context resets if in installer mode (amulhern)
+ Related: rhbz#1038146
+ Resolves: rhbz#1038146
+- Look up SELinux context for lost+found where it is needed (amulhern)
+ Resolves: rhbz#1038146
+- Don't reset the SELinux context before the filesystem is mounted (amulhern)
+ Related: rhbz#1038146
+ Resolves: rhbz#1038146
+- Test setting selinux context on lost+found (amulhern)
+ Related: rhbz#1038146
+ Resolves: rhbz#1038146
+- fcoe: add fcoe=<NIC>:<EDB> to boot options for nics added manually (rvykydal)
+ Related: rhbz#1040215
+- Only retrieve the unit specifier once (dshea)
+ Related: rhbz#1039485
+- Accept both English and localized sizes in Size specs. (dshea)
+ Related: rhbz#1039485
+- Use a namedtuple to store information on unit prefixes (dshea)
+ Related: rhbz#1039485
+- Catch any exception raised by findExistingInstallations. (dlehman)
+ Resolves: rhbz#1052454
+- Multipath, fwraid members need not be in exclusiveDisks. (dlehman)
+ Resolves: rhbz#1032919
+
+* Mon Jan 20 2014 Brian C. Lane <bcl@redhat.com> - 0.18.18-1
+- Fall back on relabeling app where available (amulhern)
+ Related: rhbz#1038590
+ Resolves: rhbz#1038590
+- Change the meaning of label field values (amulhern)
+ Related: rhbz#1038590
+ Resolves: rhbz#1038590
+- Enable labeling on NTFS filesystem (amulhern)
+ Related: rhbz#1038590
+ Resolves: rhbz#1038590
+- Enable labeling on HFS filesystem (amulhern)
+ Related: rhbz#1038590
+ Resolves: rhbz#1038590
+- Add a method that indicates ability to relabel (amulhern)
+ Related: rhbz#1038590
+ Resolves: rhbz#1038590
+- Use filesystem creation app to set filesystem label (amulhern)
+ Related: rhbz#1038590
+ Resolves: rhbz#1038590
+- Import errors so FSError name is resolved (amulhern)
+ Related: rhbz#1038590
+ Resolves: rhbz#1038590
+- Remove BTRFS._getFormatOptions (amulhern)
+ Related: rhbz#1038590
+ Resolves: rhbz#1038590
+- Make an additional class for labeling abstractions (amulhern)
+ Related: rhbz#1038590
+ Resolves: rhbz#1038590
+- Fix copyright date (amulhern)
+ Related: rhbz#1038590
+ Resolves: rhbz#1038590
+- Remove redundant _defaultFormatOptions field (amulhern)
+ Related: rhbz#1038590
+ Resolves: rhbz#1038590
+- Remove code about unsetting a label (amulhern)
+ Related: rhbz#1038590
+ Resolves: rhbz#1038590
+- Return None if the filesystem has no label (amulhern)
+ Related: rhbz#1038590
+ Resolves: rhbz#1038590
+- Removed redundant check for existance of filesystem (amulhern)
+ Related: rhbz#1038590
+ Resolves: rhbz#1038590
+- Have writeLabel throw a more informative exception (amulhern)
+ Related: rhbz#1038590
+ Resolves: rhbz#1038590
+- Clear whole-disk formatting before initializing disks. (dlehman)
+ Resolves: rhbz#1052442
+
+* Fri Jan 17 2014 Brian C. Lane <bcl@redhat.com> - 0.18.17-1
+- Simplify calculation of vol size when adding a btrfs subvol. (dlehman)
+ Resolves: rhbz#1052439
+- Preparation for lv resize is a subset of that for lv destroy. (dlehman)
+ Resolves: rhbz#1029634
+
+* Thu Jan 16 2014 Brian C. Lane <bcl@redhat.com> - 0.18.16-1
+- iscsi: in installer automatically log into firmware iscsi targets (rvykydal)
+ Resolves: rhbz#1034291
+
+* Tue Jan 14 2014 Brian C. Lane <bcl@redhat.com> - 0.18.15-1
+- Allow resetting partition size to current on-disk size. (dlehman)
+ Related: rhbz#918454
+ Related: rhbz#1029630
+- Fix shouldClear for devices with protected descendants. (dlehman)
+ Resolves: rhbz#902417
+- Handle nested btrfs subvolumes correctly. (dlehman)
+ Related: rhbz#1026210
+- Devices with non-existent formatting are resizable. (dlehman)
+ Resolves: rhbz#1029633
+- Always run action's cancel method as part of cancelAction. (dlehman)
+ Related: rhbz#1029630
+- Do not hide non-existent devices. (dlehman)
+ Resolves: rhbz#1029628
+- Fix handling of overcommitted thin pools in thinp factory. (dlehman)
+ Resolves: rhbz#1027376
+- Fix name checking for new thin lvs. (dlehman)
+ Resolves: rhbz#1027375
+
+* Fri Jan 10 2014 Brian C. Lane <bcl@redhat.com> - 0.18.14-1
+- Move label setter and getter into DeviceFormat class (amulhern)
+ Related: rhbz#1038590
+ Resolves: rhbz#1038590
+- Add a test for labeling swap devices (amulhern)
+ Related: rhbz#1038590
+ Resolves: rhbz#1038590
+- Default to None to mean none, rather than empty string (amulhern)
+ Related: rhbz#1038590
+ Resolves: rhbz#1038590
+- Add a labelFormatOK method to the DeviceFormat's interface (amulhern)
+ Related: rhbz#1038590
+ Resolves: rhbz#1038590
+- Indicate whether the filesystem can label (amulhern)
+ Related: rhbz#1038590
+ Resolves: rhbz#1038590
+- Restore ability to write an empty label where possible (amulhern)
+ Resolves: rhbz#1038590
+- More tests to check writing and reading labels (amulhern)
+ Related: rhbz#1038590
+ Resolves: rhbz#1038590
+- Remove fsConfigFromFile (amulhern)
+ Related: rhbz#1038590
+ Resolves: rhbz#1038590
+- Changes to the handling of filesystem labeling (amulhern)
+ Resolves: rhbz#1038590
+- Forget existing partitions of device becoming a multipath member (rvykydal)
+ Resolves: rhbz#1043444
+ Related: rhbz#1043444
+
+* Tue Dec 17 2013 Brian C. Lane <bcl@redhat.com> - 0.18.13-1
+- Add initial 64-bit ARM (aarch64) support (dmarlin)
+ Resolves: rhbz#1034435
+- Make error message in setDefaultFSType more informative (amulhern)
+ Resolves: rhbz#1019766
+ Related: rhbz#1019766
+- Set sysfsPath of LUKSDevice when adding to device tree (jsafrane)
+ Resolves: rhbz#1019638
+
+* Mon Dec 16 2013 Brian C. Lane <bcl@redhat.com> - 0.18.12-1
+- Change XFS maximum to 16EB (bcl)
+ Resolves: rhbz#1016035
+- fcoe: give error message in case of fail when adding device (rvykydal)
+ Related: rhbz#903122
+ Resolves: rhbz#903122
+- fcoe: adapt bnx2fc detection to changed sysfs path structure (rvykydal)
+ Related: rhbz#903122
+ Resolves: rhbz#903122
+- Update format of iscsi device becoming multipath member (rvykydal)
+ Resolves: rhbz#1039086
+
* Thu Nov 14 2013 David Lehman <dlehman@redhat.com> - 0.18.11-1
- Fix detection of lvm setups. (dlehman)
Resolves: rhbz#1026468