[Frugalware-darcs] frugalware-current: os-prober-37922-2-i686

[VMiklos]

[os-prober-37922-2-i686
VMiklos <vmiklos at frugalware.org>**20060616191707
 multiple fixes in -frugalware.diff for linux-boot-prober:
 handle if the filesystem is already mounted
 handle if there is no initrd
] {
hunk ./extra/source/apps/os-prober/FrugalBuild 1
-# Last Modified: Fri, 16 Jun 2006 01:13:00 +0200
+# Last Modified: Fri, 16 Jun 2006 21:16:59 +0200
hunk ./extra/source/apps/os-prober/FrugalBuild 7
-pkgrel=1
+pkgrel=2
hunk ./extra/source/apps/os-prober/FrugalBuild 24
+	# nice. no ./configure, no Makefile, nothing. a real Debian pkg ;-)
hunk ./extra/source/apps/os-prober/FrugalBuild 39
-	  'afe2baf4d27201e741a6912a643ce74e5aca9a2a')
+	  'cce4ac0cb4f3822848b23a7e434389bd9613278c')
hunk ./extra/source/apps/os-prober/os-prober-frugalware.diff 1
+diff -Naur os-prober.orig/linux-boot-probes/common/50mounted-tests os-prober/linux-boot-probes/common/50mounted-tests
+--- os-prober.orig/linux-boot-probes/common/50mounted-tests	2006-06-16 00:24:48.000000000 +0200
++++ os-prober/linux-boot-probes/common/50mounted-tests	2006-06-16 20:41:08.000000000 +0200
+@@ -23,6 +23,10 @@
+ 	mkdir $tmpmnt
+ fi
+ 
++oldmnt=$(mount |grep $partition|cut -d' ' -f 3)
++if [ -n "$oldmnt" ]; then
++	umount $partition
++fi
+ for type in $(grep -v nodev /proc/filesystems); do
+ 	if mount -o ro -t $type $partition $tmpmnt 2>/dev/null; then
+ 		bootpart=""
+@@ -87,6 +91,9 @@
+ 					debug "$test succeeded"
+ 					umount $tmpmnt/boot 2>/dev/null || true 	
+ 					umount $tmpmnt
++					if [ -n "$oldmnt" ]; then
++						mount $partition $oldmnt
++					fi
+ 					rmdir $tmpmnt || true
+ 					exit 0
+ 				fi
+@@ -95,6 +102,9 @@
+ 		
+ 		umount $tmpmnt/boot 2>/dev/null || true 	
+ 		umount $tmpmnt
++		if [ -n "$oldmnt" ]; then
++			mount $partition $oldmnt
++		fi
+ 
+ 		break
+ 	fi
+diff -Naur os-prober.orig/linux-boot-probes/mounted/x86/40grub os-prober/linux-boot-probes/mounted/x86/40grub
+--- os-prober.orig/linux-boot-probes/mounted/x86/40grub	2006-06-16 00:24:48.000000000 +0200
++++ os-prober/linux-boot-probes/mounted/x86/40grub	2006-06-16 20:12:22.000000000 +0200
+@@ -11,8 +11,7 @@
+ 
+ entry_result () {
+ 	if [ -n "$kernel" ] && \
+-	   [ -e "$mpoint/$kernel" ] && \
+-	   [ -e "$mpoint/$initrd" ]; then
++	   [ -e "$mpoint/$kernel" ]; then
+ 		result "$rootpart:$bootpart:$title:$kernel:$initrd:$parameters"
+ 		found_item=1
+ 	fi
+@@ -42,7 +41,7 @@
+ 				title="$(echo $@ | sed 's/://g')"
+ 			;;
+ 			kernel)
+-				kernel="$2"
++				kernel="$(echo $2 | sed 's/(.*)//')"
+ 				shift 2
+ 				parameters="$@"
+ 				# Systems with a separate /boot will not have
hunk ./extra/source/apps/os-prober/os-prober-frugalware.diff 59
-+++ os-prober/os-probes/mounted/common/90linux-distro	2006-06-16 01:04:32.000000000 +0200
++++ os-prober/os-probes/mounted/common/90linux-distro	2006-06-16 20:39:12.000000000 +0200
}