!21 【Mainline】Update to 1.81
From: @yixiangzhike Reviewed-by: @xiezhipeng1 Signed-off-by: @xiezhipeng1
This commit is contained in:
commit
4d9209605c
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
|
||||
===================================================================
|
||||
--- os-prober-1.58.orig/linux-boot-probes/mounted/common/40grub2
|
||||
+++ 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
|
||||
--- a/linux-boot-probes/mounted/common/40grub2
|
||||
+++ b/linux-boot-probes/mounted/common/40grub2
|
||||
@@ -77,7 +77,7 @@ parse_grub_menu () {
|
||||
ignore_item=1
|
||||
fi
|
||||
@ -17,6 +17,6 @@ Index: os-prober-1.58/linux-boot-probes/mounted/common/40grub2
|
||||
;;
|
||||
- initrd)
|
||||
+ initrd*)
|
||||
initrd="$(echo "$2" | sed 's/(.*)//')"
|
||||
# Initrd same.
|
||||
if [ "$partition" != "$bootpart" ]; then
|
||||
shift
|
||||
initrd=""
|
||||
for initrd_path in "$@"; do
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: os-prober
|
||||
Version: 1.79
|
||||
Release: 2
|
||||
Version: 1.81
|
||||
Release: 1
|
||||
Summary: Probe disks on the system for other operating systems
|
||||
License: GPLv2+ and GPL+
|
||||
URL: http://kitenet.net/~joey/code/os-prober/
|
||||
@ -12,7 +12,6 @@ Patch2: os-prober-mounted-partitions-fix.patch
|
||||
Patch3: os-prober-umount-fix.patch
|
||||
Patch4: os-prober-grub2-parsefix.patch
|
||||
Patch5: os-prober-grepfix.patch
|
||||
Patch6: os-prober-gentoo-fix.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
Requires: udev coreutils util-linux grep /bin/sed /sbin/modprobe grub2-tools-minimal
|
||||
@ -84,6 +83,9 @@ fi
|
||||
%{_libexecdir}/*
|
||||
|
||||
%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
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user