about summary refs log tree commit diff
path: root/pkgs/tools/filesystems/nixpart
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2016-01-22 13:22:46 +0100
committeraszlig <aszlig@redmoonstudios.org>2016-01-22 13:30:43 +0100
commit24ae34c0d7a762d2b56a687e8770e8250d7c3382 (patch)
tree10fc4071153f6afc2d1ba23364bf3a6f1946fe36 /pkgs/tools/filesystems/nixpart
parent8c4256e6514dee65321fad3ce148ff200afb50d3 (diff)
downloadnixlib-24ae34c0d7a762d2b56a687e8770e8250d7c3382.tar
nixlib-24ae34c0d7a762d2b56a687e8770e8250d7c3382.tar.gz
nixlib-24ae34c0d7a762d2b56a687e8770e8250d7c3382.tar.bz2
nixlib-24ae34c0d7a762d2b56a687e8770e8250d7c3382.tar.lz
nixlib-24ae34c0d7a762d2b56a687e8770e8250d7c3382.tar.xz
nixlib-24ae34c0d7a762d2b56a687e8770e8250d7c3382.tar.zst
nixlib-24ae34c0d7a762d2b56a687e8770e8250d7c3382.zip
nixpart0: Fix race condition in formatting devices
This adds a backport of rhinstaller/blivet#39 to the pinned blivet
version 0.17, it's addressing the following upstream bug:

https://bugzilla.redhat.com/show_bug.cgi?id=1196397

It has been reported at aszlig/nixpart#7 and tested by @manveru (the
issue reporter), thanks a lot.

Thanks also to @domenkozar for finding the upstream issue.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: Michael Fellinger <m.fellinger@gmail.com>
Fixes: aszlig/nixpart#7
Diffstat (limited to 'pkgs/tools/filesystems/nixpart')
-rw-r--r--pkgs/tools/filesystems/nixpart/0.4/blivet.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.patch b/pkgs/tools/filesystems/nixpart/0.4/blivet.patch
index 1758d18442d2..d53231a84fd6 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/blivet.patch
+++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.patch
@@ -37,3 +37,15 @@ index 705b93d..7268d71 100644
  
  # load the udev library
  libudev = CDLL(libudev)
+diff --git a/blivet/deviceaction.py b/blivet/deviceaction.py
+index 705b93d..60f8f32 100644
+--- a/blivet/deviceaction.py
++++ b/blivet/deviceaction.py
+@@ -467,6 +467,7 @@ def execute(self):
+ 
+                 self.device.disk.format.commitToDisk()
+ 
++            self.device.setup()
+             self.device.format.create(device=self.device.path,
+                                       options=self.device.formatArgs)
+