Gentoo Archives: gentoo-commits

From: Ben Kohler <bkohler@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/os-prober/files/
Date: Wed, 22 Dec 2021 12:34:20
Message-Id: 1640176429.8d6d17462775a88220078b4ae38e4e6228164a75.bkohler@gentoo
1 commit: 8d6d17462775a88220078b4ae38e4e6228164a75
2 Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
3 AuthorDate: Tue Dec 21 00:36:36 2021 +0000
4 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 22 12:33:49 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d6d1746
7
8 sys-boot/os-prober: add void linux detection patch
9
10 Bug: https://bugs.gentoo.org/817905
11 Package-Manager: Portage-3.0.30, Repoman-3.0.3
12 Signed-off-by: Peter Levine <plevine457 <AT> gmail.com>
13 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
14
15 .../os-prober/files/os-prober-1.79-detect-void.patch | 20 ++++++++++++++++++++
16 1 file changed, 20 insertions(+)
17
18 diff --git a/sys-boot/os-prober/files/os-prober-1.79-detect-void.patch b/sys-boot/os-prober/files/os-prober-1.79-detect-void.patch
19 new file mode 100644
20 index 000000000000..9d7855906b78
21 --- /dev/null
22 +++ b/sys-boot/os-prober/files/os-prober-1.79-detect-void.patch
23 @@ -0,0 +1,20 @@
24 +Handle Void Linux detection. From upstream https://github.com/void-linux/void-packages/blob/2fd8d4df94855a157a4de16c61d54153e16ef185/srcpkgs/os-prober/patches/detect-void.patch
25 +
26 +Bug: https://bugs.gentoo.org/817905
27 +
28 +--- a/os-probes/mounted/common/90linux-distro
29 ++++ b/os-probes/mounted/common/90linux-distro
30 +@@ -116,6 +116,13 @@
31 + elif [ -e "$dir/sbin/pkgtool" ]; then
32 + short="Slackware"
33 + long="Slackware Linux"
34 ++ elif [ -e "$dir/sbin/xbps-install" ]; then
35 ++ short="Void"
36 ++ if file "$dir/sbin/xbps-install"|grep -q 32-bit; then
37 ++ long="Void Linux 32"
38 ++ else
39 ++ long="Void Linux 64"
40 ++ fi
41 + elif grep -qs OpenLinux "$dir/etc/issue"; then
42 + short="Caldera"
43 + long="Caldera OpenLinux"