Compare commits
11 Commits
229fa82ca5
...
fe17733764
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fe17733764 | ||
|
|
d760651f05 | ||
|
|
9bfd81826e | ||
|
|
83c8dcfa38 | ||
|
|
68adf65d92 | ||
|
|
b89d94d90f | ||
|
|
ab7bfedca0 | ||
|
|
17043c2412 | ||
|
|
6a22d8492c | ||
|
|
6b78885378 | ||
|
|
f28dd426df |
@ -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.79.tar.gz
Normal file
BIN
os-prober-1.79.tar.gz
Normal file
Binary file not shown.
@ -1,6 +1,6 @@
|
||||
Name: os-prober
|
||||
Version: 1.74
|
||||
Release: 12
|
||||
Version: 1.79
|
||||
Release: 2
|
||||
Summary: Probe disks on the system for other operating systems
|
||||
License: GPLv2+ and GPL+
|
||||
URL: http://kitenet.net/~joey/code/os-prober/
|
||||
@ -14,10 +14,8 @@ Patch4: os-prober-grub2-parsefix.patch
|
||||
Patch5: os-prober-grepfix.patch
|
||||
Patch6: os-prober-gentoo-fix.patch
|
||||
|
||||
Patch9000: bugfix-wait-for-device-mapper-device-is-created.patch
|
||||
|
||||
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 grub2-tools-minimal
|
||||
|
||||
%description
|
||||
Os-prober can probe disks on the system for other operating systems,
|
||||
@ -29,9 +27,11 @@ make your other installed OS hard to boot.
|
||||
find -type f -exec sed -i -e 's|usr/lib|usr/libexec|g' {} \;
|
||||
sed -i -e 's|grub-probe|grub2-probe|g' os-probes/common/50mounted-tests \
|
||||
linux-boot-probes/common/50mounted-tests
|
||||
sed -i -e 's|grub-mount|grub2-mount|g' os-probes/common/50mounted-tests \
|
||||
linux-boot-probes/common/50mounted-tests common.sh
|
||||
|
||||
%build
|
||||
%make_build
|
||||
%make_build CFLAGS="%{optflags}"
|
||||
|
||||
%install
|
||||
install -m 0755 -d $RPM_BUILD_ROOT%{_bindir}
|
||||
@ -84,6 +84,21 @@ fi
|
||||
%{_libexecdir}/*
|
||||
|
||||
%changelog
|
||||
* Tue Oct 25 2022 yanglongkang <yanglongkang@h-partners.com> - 1.79-2
|
||||
- rebuild for next release
|
||||
|
||||
* Sat Nov 27 2021 yangzhuangzhuang<yangzhuangzhuang1@huawei.com> - 1.79-1
|
||||
- update version to 1.79
|
||||
|
||||
* Sat Sep 4 2021 zoulin<zoulin13@huawei.com> - 1.77-3
|
||||
- Add "%%{optflags}" for %build
|
||||
|
||||
* Wed May 26 2021 yangzhuangzhuang<yangzhuangzhuang1@huawei.com> - 1.77-2
|
||||
- Remove code using device mapper
|
||||
|
||||
* 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
|
||||
- fix os-prober command failed.
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user