!6 update os-prober to 1.77

Merge pull request !6 from linwei9/master
This commit is contained in:
openeuler-ci-bot 2020-07-25 11:50:55 +08:00 committed by Gitee
commit 6a22d8492c
4 changed files with 5 additions and 50 deletions

View File

@ -1,46 +0,0 @@
From 4811d40604f58696ddd738cea336d3af53248329 Mon Sep 17 00:00:00 2001
From: Wang shuo <wangshuo47@huawei.com>
Date: Thu, 20 Jun 2019 11:17:28 +0800
Subject: [PATCH] os-prober: wait for device mapper device is created
reason: wait for device mapper device is created
Signed-off-by: Wang shuo <wangshuo47@huawei.com>
---
common.sh | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/common.sh b/common.sh
index 8030efa..0980208 100644
--- a/common.sh
+++ b/common.sh
@@ -225,9 +225,11 @@ find_uuid () {
do_dmsetup () {
local prefix partition dm_device partition_name size_p
+ local int
prefix="$1"
partition="$2"
dm_device=
+ int=1
if type dmsetup >/dev/null 2>&1 && \
type blockdev >/dev/null 2>&1; then
@@ -240,6 +242,14 @@ do_dmsetup () {
else
debug "creating device mapper device $dm_device"
echo "0 $size_p linear $partition 0" | dmsetup create -r $partition_name
+ while(( $int<=3 ))
+ do
+ if [ -e "$dm_device" ]; then
+ break
+ fi
+ let "int++"
+ sleep 1
+ done
fi
fi
echo "$dm_device"
--
2.19.1

Binary file not shown.

BIN
os-prober-1.77.tar.gz Normal file

Binary file not shown.

View File

@ -1,6 +1,6 @@
Name: os-prober Name: os-prober
Version: 1.74 Version: 1.77
Release: 12 Release: 1
Summary: Probe disks on the system for other operating systems Summary: Probe disks on the system for other operating systems
License: GPLv2+ and GPL+ License: GPLv2+ and GPL+
URL: http://kitenet.net/~joey/code/os-prober/ URL: http://kitenet.net/~joey/code/os-prober/
@ -14,8 +14,6 @@ Patch4: os-prober-grub2-parsefix.patch
Patch5: os-prober-grepfix.patch Patch5: os-prober-grepfix.patch
Patch6: os-prober-gentoo-fix.patch Patch6: os-prober-gentoo-fix.patch
Patch9000: bugfix-wait-for-device-mapper-device-is-created.patch
BuildRequires: gcc git BuildRequires: gcc git
Requires: udev coreutils util-linux grep /bin/sed /sbin/modprobe device-mapper Requires: udev coreutils util-linux grep /bin/sed /sbin/modprobe device-mapper
@ -84,6 +82,9 @@ fi
%{_libexecdir}/* %{_libexecdir}/*
%changelog %changelog
* Thu Jul 23 2020 linwei<linwei54@huawei.com> - 1.77-1
- update os-prober to 1.77
* Thu Feb 27 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.74-12 * Thu Feb 27 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.74-12
- fix os-prober command failed. - fix os-prober command failed.