Attachment 689265 Details for Bug 875356 – 0004-Use-one-set-of-counters-for-all-spindles.patch

[patch] 0004-Use-one-set-of-counters-for-all-spindles.patch

0004-Use-one-set-of-counters-for-all-spindles.patch (text/plain), 6.09 KB, created by John Reiser on 2013-01-28 19:26:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Reiser

Created: 2013-01-28 19:26:29 UTC

Size: 6.09 KB

patch

obsolete

>From 9981990faea49426d5d049b191e7ee14e829d946 Mon Sep 17 00:00:00 2001
>From: John Reiser <jreiser@BitWagon.com>
>Date: Mon, 7 Jan 2013 15:54:55 -0800
>Subject: [PATCH 4/4] Use one set of counters for all spindles.
>
>---
> os-prober                               | 7 ++++++-
> os-probes/mounted/common/40lsb          | 2 +-
> os-probes/mounted/common/90linux-distro | 7 +++----
> os-probes/mounted/x86/10freedos         | 2 +-
> os-probes/mounted/x86/10qnx             | 2 +-
> os-probes/mounted/x86/20microsoft       | 2 +-
> os-probes/mounted/x86/30utility         | 2 +-
> os-probes/mounted/x86/70hurd            | 2 +-
> os-probes/mounted/x86/80minix           | 2 +-
> os-probes/mounted/x86/83haiku           | 2 +-
> os-probes/mounted/x86/90solaris         | 2 +-
> 11 files changed, 18 insertions(+), 14 deletions(-)
>
>diff --git a/os-prober b/os-prober
>index ad18396..78451fa 100755
>--- a/os-prober
>+++ b/os-prober
>@@ -258,6 +258,11 @@ mkdir  "$tmpmntdir" >/dev/null 2>&1 || true
> 	    fi
> 	done 1>&2
> ) 9>&1 | logger 1>&-  # fd_logger
>-) 3>&1  # fd_result
>+) 3>&1 |  # fd_result
>+(   _IFS="$IFS"; IFS=':'
>+    while read part long short type; do
>+        echo "$part:$long:$short"$(( ++$short ))":$type"
>+    done
>+)
> 
> # EOF os-prober
>diff --git a/os-probes/mounted/common/40lsb b/os-probes/mounted/common/40lsb
>index a8e2246..35bb0be 100755
>--- a/os-probes/mounted/common/40lsb
>+++ b/os-probes/mounted/common/40lsb
>@@ -39,7 +39,7 @@ if [ -z "$short" ]; then
> 	short="UnknownLSB"
> fi
> 
>-result "$partition:$long:$short$((label += 1)):linux"  # success
>+result "$partition:$long:$short:linux"  # success
> 
> if [ 1 == "$discard" ]; then
>     umount $dir
>diff --git a/os-probes/mounted/common/90linux-distro b/os-probes/mounted/common/90linux-distro
>index 1125fad..2985e5d 100755
>--- a/os-probes/mounted/common/90linux-distro
>+++ b/os-probes/mounted/common/90linux-distro
>@@ -7,13 +7,13 @@ set -e
> origdir=$PWD
> 
> function fail() {
>-	echo "$partition $dir $type $discard"  1>&7  # failure
>+	echo "$partition $dir $type $discard"  # failure
> 
> 	cd $origdir
> }
> 
> function succeed() {
>-	echo "$partition:$long:$short"  1>&6  # success
>+	result "$partition:$long:$short:linux"  # success
> 
> 	cd $origdir
> 	if [ 1 == "$discard" ]; then
>@@ -124,7 +124,6 @@ function filter() {
>   done  # read next partition
> }
> 
>-( filter 6>&1 1>&- | while read line; do result "$line$((label += 1)):linux"; done
>-) 7>&1
>+filter
> 
> # EOF
>diff --git a/os-probes/mounted/x86/10freedos b/os-probes/mounted/x86/10freedos
>index daf58dd..a8984e6 100755
>--- a/os-probes/mounted/x86/10freedos
>+++ b/os-probes/mounted/x86/10freedos
>@@ -14,7 +14,7 @@ case "$type" in
> esac
> 
> if item_in_dir -q kernel.sys "$2" && item_in_dir -q command.com "$2"; then
>-	result "$1:FreeDOS:FreeDos$((label += 1)):chain"  # success
>+	result "$1:FreeDOS:FreeDos:chain"  # success
> 	if [ 1 == "$discard" ]; then
> 	    umount "$dir"
> 	    rmdir "$dir"
>diff --git a/os-probes/mounted/x86/10qnx b/os-probes/mounted/x86/10qnx
>index a6d15f5..19ca65b 100755
>--- a/os-probes/mounted/x86/10qnx
>+++ b/os-probes/mounted/x86/10qnx
>@@ -12,7 +12,7 @@ case "$type" in
> esac
> 
> if [ -e "$mpoint/.boot" ]; then
>-	result "$partition:QNX:QNX$((label += 1)):chain"  # success
>+	result "$partition:QNX:QNX:chain"  # success
> 
> 	if [ 1 == "$discard" ]; then
> 	    umount "$dir"
>diff --git a/os-probes/mounted/x86/20microsoft b/os-probes/mounted/x86/20microsoft
>index 41fcda7..b28cb80 100755
>--- a/os-probes/mounted/x86/20microsoft
>+++ b/os-probes/mounted/x86/20microsoft
>@@ -105,7 +105,7 @@ if [ -z "$found" ]; then
> 	echo "$partition $dir $type $discard"; continue  # failure
> fi
> 
>-result "${partition}:${long}:${short}$((label += 1)):chain"  # success
>+result "${partition}:${long}:${short}:chain"  # success
> 
> 	if [ 1 == "$discard" ]; then
> 	    umount "$dir"
>diff --git a/os-probes/mounted/x86/30utility b/os-probes/mounted/x86/30utility
>index 48257c6..c9ba6d5 100755
>--- a/os-probes/mounted/x86/30utility
>+++ b/os-probes/mounted/x86/30utility
>@@ -29,7 +29,7 @@ else
> 	echo "$partition $dir $type $discard"; continue  # failure
> fi
> 
>-result "${partition}:${long}:${short}$((label += 1)):chain"  # success
>+result "${partition}:${long}:${short}:chain"  # success
> 
> 	if [ 1 == "$discard" ]; then
> 	    umount "$dir"
>diff --git a/os-probes/mounted/x86/70hurd b/os-probes/mounted/x86/70hurd
>index 755324a..a053ded 100755
>--- a/os-probes/mounted/x86/70hurd
>+++ b/os-probes/mounted/x86/70hurd
>@@ -6,7 +6,7 @@ set -e
> while read partition dir type discard; do
> 
> if [ -e "$dir/servers/exec" ] && [ -x "$dir/hurd/init" ]; then
>-	result "$partition:GNU/Hurd:Hurd$((label += 1)):hurd"  # success
>+	result "$partition:GNU/Hurd:Hurd:hurd"  # success
> 
> 	if [ 1 == "$discard" ]; then
> 	    umount "$dir"
>diff --git a/os-probes/mounted/x86/80minix b/os-probes/mounted/x86/80minix
>index 412cedf..da43e3f 100755
>--- a/os-probes/mounted/x86/80minix
>+++ b/os-probes/mounted/x86/80minix
>@@ -18,7 +18,7 @@ if [ -f "$dir/minix" ] || [ -e "$dir/boot/image_big" ]; then
> 		boot="chain"
> 	fi
> 
>-	result "$partition:Minix:Minix$((label += 1)):$boot"  # success
>+	result "$partition:Minix:Minix:$boot"  # success
> 	if [ 1 == "$discard" ]; then
> 	    umount "$dir"
> 	    rmdir "$dir"
>diff --git a/os-probes/mounted/x86/83haiku b/os-probes/mounted/x86/83haiku
>index bfeb262..c630d52 100755
>--- a/os-probes/mounted/x86/83haiku
>+++ b/os-probes/mounted/x86/83haiku
>@@ -25,7 +25,7 @@ if system="$(item_in_dir "system" "$mpoint")" &&
> 		item_in_dir -q "kernel_x86_64" "$mpoint/$system")
> then
> 	debug "Stage 2 bootloader and kernel found"
>-	result "$partition:Haiku:Haiku$((label += 1)):chain"  # success
>+	result "$partition:Haiku:Haiku:chain"  # success
> 	if [ 1 == "$discard" ]; then
> 	    umount "$dir"
> 	    rmdir "$dir"
>diff --git a/os-probes/mounted/x86/90solaris b/os-probes/mounted/x86/90solaris
>index 4e10cbd..0d9f6bd 100755
>--- a/os-probes/mounted/x86/90solaris
>+++ b/os-probes/mounted/x86/90solaris
>@@ -9,7 +9,7 @@ set -e
> while read partition dir type discard; do
> 
> if [ -f "$dir/etc/system" ] && [ -f "$dir/etc/vfstab" ]; then
>-	result "$partition:Solaris/IA32:Solaris$((label += 1)):chain"  # success
>+	result "$partition:Solaris/IA32:Solaris:chain"  # success
> 
> 	if [ 1 == "$discard" ]; then
> 	    umount "$dir"
>-- 
>1.8.1
>

Actions: View | Diff

Attachments on bug 875356: 652201 | 688069 | 689262 | 689263 | 689264 | 689265 | 692170 | 692171 | 692172