Attachment 688069 Details for Bug 875356 – further patch to parallelize by spindle

[patch] further patch to parallelize by spindle

diffs.out (text/plain), 23.65 KB, created by John Reiser on 2013-01-26 15:41:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Reiser

Created: 2013-01-26 15:41:48 UTC

Size: 23.65 KB

patch

obsolete

>diff --git a/linux-boot-probes/common/50mounted-tests b/linux-boot-probes/common/50mounted-tests
>index 481255f..fb85d67 100755
>--- a/linux-boot-probes/common/50mounted-tests
>+++ b/linux-boot-probes/common/50mounted-tests
>@@ -3,16 +3,9 @@
> . /usr/share/os-prober/common.sh
> set -e
> 
>-tmpmntdir=/var/lib/os-prober/mount
>-mkdir  "$tmpmntdir" >/dev/null 2>&1 || true
>-(cd $tmpmntdir
>-    umount -f lbp* >/dev/null 2>&1 || true
>-    rmdir     lbp* >/dev/null 2>&1 || true
>-)
>+while read partition mntpfx; do
> 
>-while read partition; do
>-
>-tmpmnt=$tmpmntdir/lbp$(( mount_count+=1 ))
>+tmpmnt=$mntpfx-$(( mount_count+=1 ))
> mkdir $tmpmnt
> 
> xtra_types=""
>diff --git a/os-prober b/os-prober
>index f821d5f..78451fa 100755
>--- a/os-prober
>+++ b/os-prober
>@@ -44,58 +44,70 @@ if type dmraid >/dev/null 2>&1; then
> fi
> 
> partitions () {
>-	# Exclude partitions that have whole_disk sysfs attribute set.
>-	if [ -d /sys/block ]; then
>-		# Exclude partitions on physical disks that are part of a
>-		# Serial ATA RAID disk.
>-		for part in /sys/block/*/*[0-9]; do
>-			if [ -f "$part/start" -a ! -f "$part/whole_disk" ]  \
>-			&& ! on_sataraid $part; then
>-				name="${part##*/}"
>-				# An empty name designates a root.
>-				if [ 0 -eq ${#name} ]; then
>-					name='/'
>-				fi
>-				if [ -e "/dev/$name" ]; then
>-					echo "/dev/$name"
>-				fi
>-			fi
>-		done
>+    filter="$1"
>+    mntpfx="$2"
>+    local drvcnt
>+    # Exclude partitions that have whole_disk sysfs attribute set.
>+    if [ -d /sys/block ]; then
>+        # Exclude partitions on physical disks that are part of a
>+        # Serial ATA RAID disk.
>+        for drive in /sys/block/*; do
>+            set -- $drive/*[0-9]; if [ -r "$1" ]; then  # actual partitions
>+                (( drvcnt += 1 ))
>+                for part do  # iterates over result of "set --" above
>+                    if [ -f "$part/start" -a ! -f "$part/whole_disk" ]  \
>+                    && ! on_sataraid $part; then
>+                        name="${part##*/}"
>+                        # An empty name designates a root.
>+                        if [ 0 -eq ${#name} ]; then
>+                            name='/'
>+                        fi
>+                        if [ -e "/dev/$name" ]; then
>+                            echo "/dev/$name" "$mntpfx-$drvcnt"
>+                        fi
>+                    fi
>+                done  |  "$filter" &
>+            fi
>+        done
> 
>-		# Add Serial ATA RAID devices
>-		if type dmraid >/dev/null 2>&1 && \
>-		   dmraid -s -c >/dev/null 2>&1; then
>-			for raidset in $(dmraid -sa -c); do
>-				for part in /dev/mapper/"$raidset"*[0-9]; do
>-					echo "$part"
>-				done
>-			done
>-		fi
>-	elif [ "$(uname -s)" = Linux ]; then
>-		echo "Cannot find list of partitions!  (Try mounting /sys.)" >&2
>-		return 1
>-	else
>-		# We don't know how to probe OSes on non-Linux kernels.  For
>-		# now, just don't get in the way.
>-		return 0
>-	fi
>+        # Add Serial ATA RAID devices
>+        if type dmraid       >/dev/null 2>&1 \
>+        &&      dmraid -s -c >/dev/null 2>&1; then
>+            (( drvcnt += 1 ))
>+            for raidset in $(dmraid -sa -c); do
>+                for part in /dev/mapper/"$raidset"*[0-9]; do
>+                    echo "$part" "$mntpfx-$drvcnt"
>+                done
>+            done  |  "$filter" &
>+        fi
>+    elif [ "$(uname -s)" = Linux ]; then
>+        echo "Cannot find list of partitions!  (Try mounting /sys.)" >&2
>+        return 1
>+    else
>+        # We don't know how to probe OSes on non-Linux kernels.  For
>+        # now, just don't get in the way.
>+        return 0
>+    fi
> 
>-	# Add MD RAID devices
>-	if [ -f /proc/mdstat ] ; then
>-		awk '/^md/ {printf "/dev/"$1"\n"}' /proc/mdstat
>-	fi
>+    # Add MD RAID devices
>+    if [ -f /proc/mdstat ] ; then
>+        (( drvcnt += 1 ))
>+        awk "/^md/ {printf \"/dev/\$1 $mntpfx-$drvcnt\\n\"}" /proc/mdstat  |  "$filter" &
>+    fi
> 
>-	# Also detect OSes on LVM volumes (assumes LVM is active)
>-	if type lvs >/dev/null 2>&1; then
>-		LVM_SUPPRESS_FD_WARNINGS=1 log_output \
>-		   lvs --noheadings --separator : -o vg_name,lv_name  2>/dev/null  |
>-		sed "s|-|--|g;s|^[[:space:]]*$.*$:$.*$$|/dev/mapper/\1-\2|"
>-		# Double the original dashes to distinguish them from the
>-		# single dash that will be added later.  Ignore leading
>-		# whitespace, then find two fields separated by a colon
>-		# and replace using /dev/mapper with the fields separated
>-		# by a dash.
>-	fi
>+    # Also detect OSes on LVM volumes (assumes LVM is active)
>+    if type lvs >/dev/null 2>&1; then
>+        (( drvcnt += 1 ))
>+        LVM_SUPPRESS_FD_WARNINGS=1 log_output \
>+           lvs --noheadings --separator : -o vg_name,lv_name  2>/dev/null  |
>+        sed "s|-|--|g;s|^[[:space:]]*$.*$:$.*$$|/dev/mapper/\1-\2 $mntpfx-$drvcnt |"  |
>+        # Double the original dashes to distinguish them from the
>+        # single dash that will be added later.  Ignore leading
>+        # whitespace, then find two fields separated by a colon
>+        # and replace using /dev/mapper with the fields separated
>+        # by a dash.
>+        "$filter"
>+    fi
> }
> 
> parse_proc_mdstat () {  # filters stdin
>@@ -170,7 +182,7 @@ for test in $libexecpfx/mounted/* \
>             $libexecpfx/mounted/common/*  # last two lines: test without install
> do
>     if [ -r "$test" -a -x "$test" -a ! -d "$test" ]; then
>-        pipe_mounted="$pipe_mounted|$test"
>+        pipe_mounted="$pipe_mounted|source $test"
>     fi
> done
> pipe_mounted="${pipe_mounted#|}"
>@@ -179,7 +191,7 @@ pipe_mounted="${pipe_mounted#|}"
> pipe_not_yet=""
> for test in $libexecpfx/*; do
>     if [ -r "$test" -a -x "$test" -a ! -d "$test" ]; then
>-        pipe_not_yet="$pipe_not_yet|$test"
>+        pipe_not_yet="$pipe_not_yet|source $test"
>     fi
> done
> pipe_not_yet="${pipe_not_yet#|}"
>@@ -193,9 +205,10 @@ pipe_not_yet="${pipe_not_yet#|}"
> # logger process that reads its stdin.  Stderr remains available for
> # debugging and emergencies.
> # Plumbing by John Reiser (jreiser bitwagon com), November 2012.
>+# Parallelize by spindles  December 2012.
> 
>-partitions | ( ( (
>-    while read partition ; do
>+func1() { # The filter chain for each spindle
>+(   while read partition mntpfx; do
>         # Distribute to proper entrypoint in pipeline of filters.
> 
> 	if ! mapped="$(mapdevfs "$partition")"; then
>@@ -212,7 +225,7 @@ partitions | ( ( (
> 		continue
> 	fi
> 	eval 'mpoint="$MPOINT_'$tamed'"'; if [ -z "$mpoint" ]; then
>-		echo "$partition"  # not yet mounted
>+		echo "$partition" "$mntpfx"  # not yet mounted
> 	else  # already mounted
> 		mpoint="$(unescape_mount "$mpoint")"
> 		if [ "$mpoint" != "/target/boot" \
>@@ -224,7 +237,18 @@ partitions | ( ( (
> 	fi
>     done  \
>        | eval "${pipe_not_yet}"
>-) 8>&1 | eval "${pipe_mounted}"  |  while read line; do
>+) 8>&1 | eval "${pipe_mounted}"
>+}
>+
>+# Directory for temporary mount points
>+tmpmntdir=/var/lib/os-prober
>+mkdir  "$tmpmntdir" >/dev/null 2>&1 || true
>+(cd $tmpmntdir
>+    umount -f osp* >/dev/null 2>&1 || true
>+    rmdir     osp* >/dev/null 2>&1 || true
>+)
>+
>+( ( partitions func1 $tmpmntdir/osp  |  while read line; do
> 	    echo '?'unknown "$line"
> 	    set -f; set -- $line; set +f
> 	    part="$1"; dir="$2"; type="$3"; discard="$4"
>@@ -234,6 +258,11 @@ partitions | ( ( (
> 	    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/common/50mounted-tests b/os-probes/common/50mounted-tests
>index 33824d5..74d9f03 100755
>--- a/os-probes/common/50mounted-tests
>+++ b/os-probes/common/50mounted-tests
>@@ -2,7 +2,7 @@
> # Sub-tests that require a mounted partition.
> set -e
> 
>-. $execpfx/common.sh
>+# . $execpfx/common.sh
> 
> delay_types=""  # file system types that should be checked last
> kfs_types=""  # kernel file system types
>@@ -20,17 +20,11 @@ for mod_type in $(grep -v nodev /proc/filesystems); do
> 	fi
> done
> 
>-tmpmntdir=/var/lib/os-prober/mount
>-mkdir  "$tmpmntdir" >/dev/null 2>&1 || true
>-(cd $tmpmntdir
>-    umount -f osp* >/dev/null 2>&1 || true
>-    rmdir     osp* >/dev/null 2>&1 || true
>-)
> 
>+# The main loop
>+while read partition mntpfx; do
> 
>-while read partition; do
>-
>-tmpmnt=$tmpmntdir/osp$(( mount_count+=1 ))
>+tmpmnt="$mntpfx"-$(( mount_count+=1 ))
> mkdir $tmpmnt
> 
> xtra_types=""
>diff --git a/os-probes/mounted/common/40lsb b/os-probes/mounted/common/40lsb
>index 2b7e576..35bb0be 100755
>--- a/os-probes/mounted/common/40lsb
>+++ b/os-probes/mounted/common/40lsb
>@@ -2,7 +2,7 @@
> # Test for LSB systems.
> set -e
> 
>-. $execpfx/common.sh
>+# . $execpfx/common.sh
> 
> while read partition dir type discard; do
> 
>@@ -11,6 +11,7 @@ if [ ! -e "$file" ]; then
>     echo "$partition $dir $type $discard"; continue  # failure
> fi
> 
>+# Lines are shell syntax: var="value"
> while read line; do eval "$line"; done < $file
> 
> release="$DISTRIB_RELEASE"
>@@ -38,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 87ec273..2985e5d 100755
>--- a/os-probes/mounted/common/90linux-distro
>+++ b/os-probes/mounted/common/90linux-distro
>@@ -2,19 +2,18 @@
> # Test for linux distributions.
> set -e
> 
>-. $execpfx/common.sh
>-path_lookup cat; export cat  # search once only
>+# . $execpfx/common.sh
> 
> 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
>@@ -39,129 +38,70 @@ function filter() {
> # The syntax with braces avoids using a subprocess.
> # All that saves 0.02 seconds over using the exit code of /bin/ls.
> # It matters when you have several dozen partitions to check.
>+# Even after that, expanding '*' in filenames is expensive in wait time.
>+# It would save 0.06 seconds per iteration (2 seconds for 32 partitions)
>+# to short-circuit from here to the end of the enclosing 'while' loop.
>     if { set -- "$dir"/lib*/ld*.so*;         [ -r "$1" ]; } \
>     || { set -- "$dir"/usr/libexec*/ld*.so*; [ -r "$1" ]; } ; then
> 	cd "$dir"/etc 2>/dev/null || { fail; continue; }
> 	short=""
>-	set -- *[_-]version
>+	set -- *[_-]version  # 'for' iterates over the result
> 
> 	for file do case "$file" in
>-	debian_version)
>-		short="Debian"
>-		long="$(printf "Debian GNU/Linux (%s)\n" "$($cat "$dir/etc/debian_version")")" ;;
>-	kanotix-version)
>-		short="Kanotix"
>-		long="$($cat "$dir/etc/kanotix-version")" ;;
>-	slackware-version)
>-		short="Slackware"
>-		long="$(printf "Slackware Linux (%s)\n" "$($cat "$dir/etc/slackware-version")")" ;;
>+	debian_version)   short="Debian";               read long <"$file"
>+		long="Debian GNU/Linux ($long)" ;;
>+	kanotix-version)  short="Kanotix";              read long <"$file" ;;
>+	slackware-version)short="Slackware";            read long <"$file"
>+		long="Slackware Linux ($long)" ;;
> 	esac; done
> 	if [ -n "$short" ]; then succeed; continue; fi
> 
> 	# RPM derived distributions may also have a redhat-release or
> 	# mandrake-release.  Set base first, then override using derived.
>-	set -- *-release
>+	set -- *-release  # 'for' iterates over the result
> 
> 	for file do case "$file" in  # base distro
>-	redhat-release)
>-		short="RedHat"
>-		long="$($cat "$dir/etc/redhat-release")" ;;
>+	redhat-release)   short="RedHat";               read long <"$file" ;;
> 	esac; done
> 
>-	for file do case "$file" in  # possible intermediate distro
>-	fedora-release)
>-		short="Fedora"
>-		long="$($cat "$dir/etc/fedora-release")" ;;
>+	for file do case "$file" in  # intermediate distro
>+	fedora-release)   short="Fedora";               read long <"$file" ;;
> 	esac; done
> 
>-	for file do case "$file" in  # possible intermediate distro
>-	mandrake-release)
>-		short="Mandrake"
>-		long="$($cat "$dir/etc/mandrake-release")" ;;
>+	for file do case "$file" in  # intermediate distro
>+	mandrake-release) short="Mandrake";             read long <"$file" ;;
> 	esac; done
> 
>-	for file do case "$file" in  # possible derived distro
>-	SuSE-release)
>-		short="SuSE"
>-		long="$(head -n 1 "$dir/etc/SuSE-release")" ;;
>-	altlinux-release)
>-		short="ALTLinux"
>-		long="$($cat "$dir/etc/altlinux-release")" ;;
>-	magic-release)
>-		short="Magic"
>-		long="$($cat "$dir/etc/magic-release")" ;;
>-	blackPanther-release)
>-		short="blackPanther"
>-		long="$($cat "$dir/etc/blackPanther-release")" ;;
>-	ark-release)
>-		short="Ark"
>-		long="$($cat "$dir/etc/ark-release")" ;;
>-	arch-release)
>-		short="Arch"
>-		long="$($cat "$dir/etc/arch-release")" ;;
>-	asplinux-release)
>-		short="ASPLinux"
>-		long="$($cat "$dir/etc/asplinux-release")" ;;
>-	lvr-release)
>-		short="LvR"
>-		long="$($cat "$dir/etc/lvr-release")" ;;
>-	caos-release)
>-		short="cAos"
>-		long="$($cat "$dir/etc/caos-release")" ;;
>-	aurox-release)
>-		short="Aurox"
>-		long="$($cat "$dir/etc/aurox-release")" ;;
>-	engarde-release)
>-		short="EnGarde"
>-		long="$($cat "$dir/etc/engarde-release")" ;;
>-	vine-release)
>-		short="Vine"
>-		long="$($cat "$dir/etc/vine-release")" ;;
>-	whitebox-release)
>-		short="WhiteBox"
>-		long="$($cat "$dir/etc/whitebox-release")" ;;
>-	pld-release)
>-		short="PLD"
>-		long="$($cat "$dir/etc/pld-release")" ;;
>-	startcom-release)
>-		short="StartCom"
>-		long="$($cat "$dir/etc/startcom-release")" ;;
>-	trustix-release)
>-		short="Trustix"
>-		long="$($cat "$dir/etc/trustix-release")" ;;
>-	openna-release)
>-		short="OpenNA"
>-		long="$($cat "$dir/etc/openna-release")" ;;
>-	conectiva-release)
>-		short="Conectiva"
>-		long="$($cat "$dir/etc/conectiva-release")" ;;
>-	gentoo-release)
>-		short="Gentoo"
>-		long="$($cat "$dir/etc/gentoo-release")" ;;
>-	cobalt-release)
>-		short="Cobalt"
>-		long="$($cat "$dir/etc/cobalt-release")" ;;
>-	yellowdog-release)
>-		short="YellowDog"
>-		long="$($cat "$dir/etc/yellowdog-release")" ;;
>-	turbolinux-release)
>-		short="Turbolinux"
>-		long="$($cat "$dir/etc/turbolinux-release")" ;;
>-	pardus-release)
>-		short="Pardus"
>-		long="$($cat "$dir/etc/pardus-release")" ;;
>-	frugalware-release)
>-		short="Frugalware Linux"
>-		long="$($cat "$dir/etc/frugalware-release")" ;;
>-	kdemar-release)
>-		short="K-DEMar"
>-		long="$(printf "K-DEMar GNU/Linux (%s)\n" "$($cat "$dir/etc/kdemar-release")")" ;;
>-	lfs-release)
>-		short="LFS"
>-		long="$(printf "Linux From Scratch (%s)\n" "$($cat "$dir/etc/lfs-release")")" ;;
>-	meego-release)
>-		short="MeeGo"
>-		long="$(head -1 "$dir/etc/meego-release")" ;;
>+	for file do case "$file" in  # derived distro
>+	SuSE-release)     short="SuSE";                 read long <"$file" ;;
>+	altlinux-release) short="ALTLinux";             read long <"$file" ;;
>+	magic-release)    short="Magic";                read long <"$file" ;;
>+	blackPanther-release) short="blackPanther";     read long <"$file" ;;
>+	ark-release)      short="Ark";                  read long <"$file" ;;
>+	arch-release)     short="Arch";                 read long <"$file" ;;
>+	asplinux-release) short="ASPLinux";             read long <"$file" ;;
>+	lvr-release)      short="LvR";                  read long <"$file" ;;
>+	caos-release)     short="cAos";                 read long <"$file" ;;
>+	aurox-release)    short="Aurox";                read long <"$file" ;;
>+	engarde-release)  short="EnGarde";              read long <"$file" ;;
>+	vine-release)     short="Vine";                 read long <"$file" ;;
>+	whitebox-release) short="WhiteBox";             read long <"$file" ;;
>+	pld-release)      short="PLD";                  read long <"$file" ;;
>+	startcom-release) short="StartCom";             read long <"$file" ;;
>+	trustix-release)  short="Trustix";              read long <"$file" ;;
>+	openna-release)   short="OpenNA";               read long <"$file" ;;
>+	conectiva-release) short="Conectiva";           read long <"$file" ;;
>+	gentoo-release)   short="Gentoo";               read long <"$file" ;;
>+	cobalt-release)   short="Cobalt";               read long <"$file" ;;
>+	yellowdog-release) short="YellowDog";           read long <"$file" ;;
>+	turbolinux-release) short="Turbolinux";         read long <"$file" ;;
>+	pardus-release)    short="Pardus";              read long <"$file" ;;
>+	frugalware-release) short="Frugalware Linux";   read long <"$file" ;;
>+	meego-release)    short="MeeGo";                read long <"$file" ;;
>+	kdemar-release)   short="K-DEMar";              read long <"$file"
>+		long="K-DEMar GNU/Linux ($long)" ;;
>+	lfs-release)      short="LFS";                  read long <"$file"
>+		long="Linux From Scratch ($long)" ;;
> 	esac; done
> 	if [ -n "$short" ]; then succeed; continue; fi
> 
>@@ -169,7 +109,7 @@ function filter() {
> 	if [ -e "$dir/sbin/pkgtool" ]; then
> 		short="Slackware"
> 		long="Slackware Linux"
>-	elif grep -qs OpenLinux "$dir/etc/issue"; then
>+	elif grep -qs OpenLinux issue; then
> 		short="Caldera"
> 		long="Caldera OpenLinux"
> 	else
>@@ -184,14 +124,6 @@ function filter() {
>   done  # read next partition
> }
> 
>-# Use two parallel streams to filter alternating partitions.
>-# Count the over-all results to avoid a race when incrementing the label.
>-( ( ( while  read line; do   echo "$line" 1>&5  # side2
>-          if read line; then echo "$line"       # side1
>-          fi
>-      done | filter 1>&-  # side1
>-) 5>&1     | filter 1>&-  # side2
>-) 6>&1     | while read line; do result "$line$((label += 1)):linux"; done
>-) 7>&1
>+filter
> 
> # EOF
>diff --git a/os-probes/mounted/m68k/10macos6-9 b/os-probes/mounted/m68k/10macos6-9
>index 646c7a7..2884f2e 100755
>--- a/os-probes/mounted/m68k/10macos6-9
>+++ b/os-probes/mounted/m68k/10macos6-9
>@@ -1,6 +1,6 @@
> #!/bin/sh
> # Probe for OS 9 via System suitcase check.
>-. /usr/share/os-prober/common.sh
>+# . /usr/share/os-prober/common.sh
> 
> set -e
> 
>diff --git a/os-probes/mounted/powerpc/10macos6-9 b/os-probes/mounted/powerpc/10macos6-9
>index 2415a04..a5592ea 100755
>--- a/os-probes/mounted/powerpc/10macos6-9
>+++ b/os-probes/mounted/powerpc/10macos6-9
>@@ -1,6 +1,6 @@
> #!/bin/sh
> # Probe for OS 9 via System suitcase check.
>-. /usr/share/os-prober/common.sh
>+# . /usr/share/os-prober/common.sh
> 
> set -e
> 
>diff --git a/os-probes/mounted/powerpc/20macosx b/os-probes/mounted/powerpc/20macosx
>index e97f30d..fa10b57 100755
>--- a/os-probes/mounted/powerpc/20macosx
>+++ b/os-probes/mounted/powerpc/20macosx
>@@ -1,6 +1,6 @@
> #!/bin/sh -e
> # Detects Mac OS X. I don't yet know how Mac OS <= 9 fits into this.
>-. /usr/share/os-prober/common.sh
>+# . /usr/share/os-prober/common.sh
> 
> partition="$1"
> mpoint="$2"
>diff --git a/os-probes/mounted/powerpc/20macosx.macosxdummyfix b/os-probes/mounted/powerpc/20macosx.macosxdummyfix
>index 5ad29da..68d5a14 100755
>--- a/os-probes/mounted/powerpc/20macosx.macosxdummyfix
>+++ b/os-probes/mounted/powerpc/20macosx.macosxdummyfix
>@@ -1,6 +1,6 @@
> #!/bin/sh -e
> # Detects Mac OS X. I don't yet know how Mac OS <= 9 fits into this.
>-. /usr/share/os-prober/common.sh
>+# . /usr/share/os-prober/common.sh
> 
> partition="$1"
> mpoint="$2"
>diff --git a/os-probes/mounted/sparc/80solaris b/os-probes/mounted/sparc/80solaris
>index 8fbe34c..d5cf8c8 100755
>--- a/os-probes/mounted/sparc/80solaris
>+++ b/os-probes/mounted/sparc/80solaris
>@@ -4,7 +4,7 @@
> 
> set -e
> 
>-. /usr/share/os-prober/common.sh
>+# . /usr/share/os-prober/common.sh
> 
> partition="$1"
> dir="$2"
>diff --git a/os-probes/mounted/x86/10freedos b/os-probes/mounted/x86/10freedos
>index a15a957..a8984e6 100755
>--- a/os-probes/mounted/x86/10freedos
>+++ b/os-probes/mounted/x86/10freedos
>@@ -1,6 +1,6 @@
> #!/bin/sh
> 
>-. $execpfx/common.sh
>+# . $execpfx/common.sh
> 
> while read partition dir type discard; do
> 
>@@ -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 6f1dc70..19ca65b 100755
>--- a/os-probes/mounted/x86/10qnx
>+++ b/os-probes/mounted/x86/10qnx
>@@ -1,6 +1,6 @@
> #!/bin/sh
> 
>-. $execpfx/common.sh
>+# . $execpfx/common.sh
> 
> while read partition dir type discard; do
> 
>@@ -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 f68d453..b28cb80 100755
>--- a/os-probes/mounted/x86/20microsoft
>+++ b/os-probes/mounted/x86/20microsoft
>@@ -3,7 +3,7 @@
> 
> set -e
> 
>-. $execpfx/common.sh
>+# . $execpfx/common.sh
> 
> while read partition dir type discard; do
> 
>@@ -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 995e523..c9ba6d5 100755
>--- a/os-probes/mounted/x86/30utility
>+++ b/os-probes/mounted/x86/30utility
>@@ -3,7 +3,7 @@
> 
> set -e
> 
>-. $execpfx/common.sh
>+# . $execpfx/common.sh
> 
> while read partition dir type discard; do
> 
>@@ -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 3e23ee0..a053ded 100755
>--- a/os-probes/mounted/x86/70hurd
>+++ b/os-probes/mounted/x86/70hurd
>@@ -1,12 +1,12 @@
> #!/bin/sh
> set -e
> 
>-. $execpfx/common.sh
>+# . $execpfx/common.sh
> 
> 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 edb09ed..da43e3f 100755
>--- a/os-probes/mounted/x86/80minix
>+++ b/os-probes/mounted/x86/80minix
>@@ -1,7 +1,7 @@
> #!/bin/sh
> set -e
> 
>-. $execpfx/common.sh
>+# . $execpfx/common.sh
> 
> while read partition dir type discard; do
> 
>@@ -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 ccd1555..c630d52 100755
>--- a/os-probes/mounted/x86/83haiku
>+++ b/os-probes/mounted/x86/83haiku
>@@ -2,7 +2,7 @@
> # Detects Haiku on BeFS partitions.
> set -e
> 
>-. $execpfx/common.sh
>+# . $execpfx/common.sh
> 
> while read partition dir type discard; do
> 
>@@ -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 00359ec..0d9f6bd 100755
>--- a/os-probes/mounted/x86/90solaris
>+++ b/os-probes/mounted/x86/90solaris
>@@ -4,12 +4,12 @@
> 
> set -e
> 
>-. $execpfx/common.sh
>+# . $execpfx/common.sh
> 
> 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"

Actions: View | Diff

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