mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-10-23 20:58:33 +00:00
Leon Anavi
7f82207f63
Upgrade to release 3.14.2: - fs: Fix filesystem type for temporary mounts - misc: Fix condition for installing pocketlint on Debian/Ubuntu - misc: Use ansible_facts instead of deprecated top-level fact variables - Update properties for started stratis pools during populate - Fix extra mount options for Stratis filesystems in fstab - Directly access _type/_name in _to_string to avoid subclass property lock - Fix deadlock between blivet_lock and logging lock Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
33 lines
1.0 KiB
Diff
33 lines
1.0 KiB
Diff
From 497b681560b39b431542bfab2b03d2a013a0d6cc Mon Sep 17 00:00:00 2001
|
|
From: Hongxu Jia <hongxu.jia@windriver.com>
|
|
Date: Fri, 16 Jun 2017 15:43:00 +0800
|
|
Subject: [PATCH] invoking mkfs with infinite timeout
|
|
|
|
This large timeout is needed when running on machines with
|
|
lots of disks, or with slow disks.
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
|
|
|
Rebase for python3-blivet 3.4.0.
|
|
|
|
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
|
---
|
|
blivet/tasks/fsmkfs.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/blivet/tasks/fsmkfs.py b/blivet/tasks/fsmkfs.py
|
|
index 936b212..39a5323 100644
|
|
--- a/blivet/tasks/fsmkfs.py
|
|
+++ b/blivet/tasks/fsmkfs.py
|
|
@@ -203,7 +203,7 @@ class FSMkfs(task.BasicApplication, FSMkfsTask, metaclass=abc.ABCMeta):
|
|
options = options or []
|
|
cmd = self._mkfs_command(options, label, set_uuid, nodiscard)
|
|
try:
|
|
- ret = util.run_program(cmd)
|
|
+ ret = util.run_program(cmd, timeout=-1)
|
|
except OSError as e:
|
|
raise FSError(e)
|
|
|