Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fdd4ea47a659adef744088ec24f1d9b6da71f994

commit fdd4ea47a659adef744088ec24f1d9b6da71f994
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Wed Mar 17 21:53:43 2010 +0100

os-prober-1.36-1-i686

- version bump

diff --git a/source/base/os-prober/FrugalBuild 
b/source/base/os-prober/FrugalBuild
index f92b444..73c1224 100644
--- a/source/base/os-prober/FrugalBuild
+++ b/source/base/os-prober/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: Miklos Vajna <vmik...@frugalware.org>

pkgname=os-prober
-pkgver=1.35
+pkgver=1.36
pkgrel=1
pkgdesc="Utility to detect other OSes on a set of drives."
url="http://packages.debian.org/os-prober";
@@ -13,8 +13,8 @@ Fpkgversep="_"
up2date="lynx -dump 
http://ftp.debian.org/debian/pool/main/o/os-prober/|Flasttar"
source=(http://ftp.debian.org/debian/pool/main/o/os-prober/os-prober_$pkgver.tar.gz
 \
os-prober-frugalware.diff)
-sha1sums=('ff164c80620b9f8b9e6d13e851e739eec4d6a5be' \
-          'f32a69a86bf8c03478a14f74d69d46d05e909615')
+sha1sums=('b915d0634cdc3c399dd90f81beb9c831b237e104' \
+          '7c25cb3b3f2d8bafd5ef02023bc55af506ed94ca')

build()
{
diff --git a/source/base/os-prober/os-prober-frugalware.diff 
b/source/base/os-prober/os-prober-frugalware.diff
index bcc662c..b3a5648 100644
--- a/source/base/os-prober/os-prober-frugalware.diff
+++ b/source/base/os-prober/os-prober-frugalware.diff
@@ -1,15 +1,16 @@
-diff -Naur os-prober.orig/os-probes/mounted/common/90linux-distro 
os-prober/os-probes/mounted/common/90linux-distro
---- os-prober.orig/os-probes/mounted/common/90linux-distro     2006-06-16 
00:24:48.000000000 +0200
-+++ os-prober/os-probes/mounted/common/90linux-distro  2006-06-16 
20:39:12.000000000 +0200
-@@ -14,7 +14,10 @@
+diff --git a/os-probes/mounted/common/90linux-distro 
b/os-probes/mounted/common/90linux-distro
+index 101fb12..1089413 100755
+--- a/os-probes/mounted/common/90linux-distro
++++ b/os-probes/mounted/common/90linux-distro
+@@ -14,7 +14,10 @@ type="$3"
# can come first.
# TODO: look for ld-linux.so on arches that have it
- if ls $dir/lib/ld*.so* >/dev/null 2>/dev/null; then
+ if ls "$dir"/lib/ld*.so* >/dev/null 2>/dev/null; then
-       if [ -e "$dir/etc/debian_version" ]; then
+       if [ -e "$dir/etc/frugalware-release" ]; then
+               short="Frugalware"
+               long="$(cat $dir/etc/frugalware-release) - $(ls 
$dir/boot/vmlinuz-*|sed -n 's|.*vmlinuz-||;$ p')"
+       elif [ -e "$dir/etc/debian_version" ]; then
short="Debian"
-               long=$(printf "Debian GNU/Linux (%s)\n" "$(cat 
$dir/etc/debian_version)")
+               long="$(printf "Debian GNU/Linux (%s)\n" "$(cat 
"$dir/etc/debian_version")")"
# RPM derived distributions may also have a redhat-release or
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to