From 4225dffad19083b5ea59841c0578be401b0b9573 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 16 Apr 2014 09:48:04 +0200 Subject: [PATCH] os-prober: try to detect void 32/64 too. --- srcpkgs/os-prober/patches/detect-void.patch | 19 +++++++++++-------- srcpkgs/os-prober/template | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/srcpkgs/os-prober/patches/detect-void.patch b/srcpkgs/os-prober/patches/detect-void.patch index 5126c0e5895..56856684eb9 100644 --- a/srcpkgs/os-prober/patches/detect-void.patch +++ b/srcpkgs/os-prober/patches/detect-void.patch @@ -1,12 +1,15 @@ ---- os-probes/mounted/common/90linux-distro.orig 2014-04-16 09:33:35.940323527 +0200 -+++ os-probes/mounted/common/90linux-distro 2014-04-16 09:34:14.403560106 +0200 -@@ -110,6 +110,9 @@ if (ls "$dir"/lib*/ld*.so* || ls "$dir"/ - elif [ -e "$dir/sbin/pkgtool" ]; then - short="Slackware" +--- os-probes/mounted/common/90linux-distro.orig 2014-04-16 09:43:51.787547427 +0200 ++++ os-probes/mounted/common/90linux-distro 2014-04-16 09:47:16.956211695 +0200 +@@ -112,7 +112,11 @@ if (ls "$dir"/lib*/ld*.so* || ls "$dir"/ long="Slackware Linux" -+ elif [ -e "$dir/sbin/xbps-install" ]; then -+ short="Void" -+ long="Void Linux" + elif [ -e "$dir/sbin/xbps-install" ]; then + short="Void" +- long="Void Linux" ++ if file "$dir/sbin/xbps-install"|grep -q 32; then ++ long="Void Linux 32" ++ else ++ long="Void Linux 64" ++ fi elif grep -qs OpenLinux "$dir/etc/issue"; then short="Caldera" long="Caldera OpenLinux" diff --git a/srcpkgs/os-prober/template b/srcpkgs/os-prober/template index 8d42d6285cd..4ed7b32c0b3 100644 --- a/srcpkgs/os-prober/template +++ b/srcpkgs/os-prober/template @@ -1,7 +1,7 @@ # Template file for 'os-prober' pkgname=os-prober version=1.63 -revision=4 +revision=5 make_dirs="/var/lib/os-prober 0755 root root" short_desc="Utility to detect other OSes on a set of drives" maintainer="Juan RP "