Compare commits
10 Commits
6a22d8492c
...
4d9209605c
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4d9209605c | ||
|
|
cfc5c04e9f | ||
|
|
7da66c0741 | ||
|
|
46da76a1ad | ||
|
|
466f0f7ab5 | ||
|
|
78db631f65 | ||
|
|
704ad7f090 | ||
|
|
b695c5c5fe | ||
|
|
ab7bfedca0 | ||
|
|
17043c2412 |
Binary file not shown.
BIN
os-prober-1.81.tar.gz
Normal file
BIN
os-prober-1.81.tar.gz
Normal file
Binary file not shown.
@ -1,13 +0,0 @@
|
|||||||
Index: os-prober/linux-boot-probes/mounted/common/90fallback
|
|
||||||
===================================================================
|
|
||||||
--- os-prober.orig/linux-boot-probes/mounted/common/90fallback
|
|
||||||
+++ os-prober/linux-boot-probes/mounted/common/90fallback
|
|
||||||
@@ -33,7 +33,7 @@ for kernpat in /vmlinuz /vmlinux /boot/v
|
|
||||||
# Dracut initramfses are named differently again.
|
|
||||||
initrdname3=$(echo "$kernfile" | sed "s/vmlinu[zx]/initramfs\*/" | sed 's/$/.img/')
|
|
||||||
# And Gentoo's also
|
|
||||||
- initrdname4=$(echo "$kernfile" | sed "s/kernel/initramfs\*/")
|
|
||||||
+ initrdname4=$(echo "$kernfile" | sed "s/kernel\|vmlinu[zx]/initramfs\*/")
|
|
||||||
foundinitrd=0
|
|
||||||
for initrd in $(eval ls "$initrdname" "$initrdname1" "$initrdname2" "$initrdname3" "$initrdname4" 2>/dev/null); do
|
|
||||||
if [ "$initrd" != "$kernfile" ] && [ -f "$initrd" ] && [ ! -L "$initrd" ]; then
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
Index: os-prober-1.58/linux-boot-probes/mounted/common/40grub2
|
diff --git a/linux-boot-probes/mounted/common/40grub2 b/linux-boot-probes/mounted/common/40grub2
|
||||||
===================================================================
|
index 664505f..5895e45 100755
|
||||||
--- os-prober-1.58.orig/linux-boot-probes/mounted/common/40grub2
|
--- a/linux-boot-probes/mounted/common/40grub2
|
||||||
+++ os-prober-1.58/linux-boot-probes/mounted/common/40grub2
|
+++ b/linux-boot-probes/mounted/common/40grub2
|
||||||
@@ -77,7 +77,7 @@ parse_grub_menu () {
|
@@ -77,7 +77,7 @@ parse_grub_menu () {
|
||||||
ignore_item=1
|
ignore_item=1
|
||||||
fi
|
fi
|
||||||
@ -17,6 +17,6 @@ Index: os-prober-1.58/linux-boot-probes/mounted/common/40grub2
|
|||||||
;;
|
;;
|
||||||
- initrd)
|
- initrd)
|
||||||
+ initrd*)
|
+ initrd*)
|
||||||
initrd="$(echo "$2" | sed 's/(.*)//')"
|
shift
|
||||||
# Initrd same.
|
initrd=""
|
||||||
if [ "$partition" != "$bootpart" ]; then
|
for initrd_path in "$@"; do
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
Name: os-prober
|
Name: os-prober
|
||||||
Version: 1.77
|
Version: 1.81
|
||||||
Release: 1
|
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+
|
||||||
@ -12,10 +12,9 @@ Patch2: os-prober-mounted-partitions-fix.patch
|
|||||||
Patch3: os-prober-umount-fix.patch
|
Patch3: os-prober-umount-fix.patch
|
||||||
Patch4: os-prober-grub2-parsefix.patch
|
Patch4: os-prober-grub2-parsefix.patch
|
||||||
Patch5: os-prober-grepfix.patch
|
Patch5: os-prober-grepfix.patch
|
||||||
Patch6: os-prober-gentoo-fix.patch
|
|
||||||
|
|
||||||
BuildRequires: gcc git
|
BuildRequires: gcc
|
||||||
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
|
%description
|
||||||
Os-prober can probe disks on the system for other operating systems,
|
Os-prober can probe disks on the system for other operating systems,
|
||||||
@ -23,10 +22,12 @@ and add them to the boot loader, so that installing current OS doesn't
|
|||||||
make your other installed OS hard to boot.
|
make your other installed OS hard to boot.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{name}-%{version} -Sgit
|
%autosetup -n %{name}-%{version} -p1
|
||||||
find -type f -exec sed -i -e 's|usr/lib|usr/libexec|g' {} \;
|
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 \
|
sed -i -e 's|grub-probe|grub2-probe|g' os-probes/common/50mounted-tests \
|
||||||
linux-boot-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
|
%build
|
||||||
%make_build
|
%make_build
|
||||||
@ -82,6 +83,21 @@ fi
|
|||||||
%{_libexecdir}/*
|
%{_libexecdir}/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Jan 28 2023 yixiangzhike <yixiangzhike007@163.com> - 1.81-1
|
||||||
|
- update version to 1.81
|
||||||
|
|
||||||
|
* Tue Oct 25 2022 yanglongkang <yanglongkang@h-partners.com> - 1.79-2
|
||||||
|
- rebuild for next release
|
||||||
|
|
||||||
|
* Wed Dec 29 2021 yangzhuangzhuang <yangzhuangzhuang1@huawei.com> - 1.79-1
|
||||||
|
- update version to 1.79
|
||||||
|
|
||||||
|
* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 1.77-3
|
||||||
|
- DESC: delete -Sgit from %autosetup, and delete BuildRequires git
|
||||||
|
|
||||||
|
* 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
|
* Thu Jul 23 2020 linwei<linwei54@huawei.com> - 1.77-1
|
||||||
- update os-prober to 1.77
|
- update os-prober to 1.77
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user