diff options
Diffstat (limited to 'meta-python/recipes-extended/python-blivet/python3-blivet/0013-add-Z-y-and-y-to-lvm.pvcreate.patch')
-rw-r--r-- | meta-python/recipes-extended/python-blivet/python3-blivet/0013-add-Z-y-and-y-to-lvm.pvcreate.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0013-add-Z-y-and-y-to-lvm.pvcreate.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0013-add-Z-y-and-y-to-lvm.pvcreate.patch deleted file mode 100644 index 33b5f51f9..000000000 --- a/meta-python/recipes-extended/python-blivet/python3-blivet/0013-add-Z-y-and-y-to-lvm.pvcreate.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From bddbfa499df16b108f2d892ee48d65617523c33d Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Thu, 9 Aug 2018 11:00:39 +0800 | ||
4 | Subject: [PATCH] add `-Z y' and `-y' to lvm.pvcreate | ||
5 | |||
6 | While reinstall a crypt fs, it occasionally failed | ||
7 | [snip] | ||
8 | |gi.overrides.BlockDev.LVMError: Process reported exit code 5: | ||
9 | WARNING: atari signature detected on /dev/mapper/luks-0e5f891c | ||
10 | -7701-48bc-a41e-8d626b6ef953 at offset 466. Wipe it? [y/n]: | ||
11 | [snip] | ||
12 | |||
13 | Add `-Z y' and `-y' to lvm.pvcreate | ||
14 | |||
15 | Upstream-Status: Submitted [https://github.com/storaged-project/blivet/pull/714] | ||
16 | |||
17 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
18 | --- | ||
19 | blivet/formats/lvmpv.py | 6 +++--- | ||
20 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
21 | |||
22 | diff --git a/blivet/formats/lvmpv.py b/blivet/formats/lvmpv.py | ||
23 | index 260cc0b..4bbb46f 100644 | ||
24 | --- a/blivet/formats/lvmpv.py | ||
25 | +++ b/blivet/formats/lvmpv.py | ||
26 | @@ -120,9 +120,9 @@ class LVMPhysicalVolume(DeviceFormat): | ||
27 | log_method_call(self, device=self.device, | ||
28 | type=self.type, status=self.status) | ||
29 | |||
30 | - # Consider use of -Z|--zero | ||
31 | - # -f|--force or -y|--yes may be required | ||
32 | - blockdev.lvm.pvcreate(self.device, data_alignment=self.data_alignment) | ||
33 | + ea_zero = blockdev.ExtraArg.new("-Z", "y") | ||
34 | + ea_yes = blockdev.ExtraArg.new("-y", "") | ||
35 | + blockdev.lvm.pvcreate(self.device, data_alignment=self.data_alignment, extra=[ea_zero, ea_yes]) | ||
36 | |||
37 | def _destroy(self, **kwargs): | ||
38 | log_method_call(self, device=self.device, | ||
39 | -- | ||
40 | 2.7.4 | ||
41 | |||