Attachment 692171 Details for Bug 875356 – 0002-Allow-testing-without-install.patch

[patch] 0002-Allow-testing-without-install.patch

0002-Allow-testing-without-install.patch (text/plain), 3.70 KB, created by John Reiser on 2013-02-03 01:55:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Reiser

Created: 2013-02-03 01:55:31 UTC

Size: 3.70 KB

patch

obsolete

>From 9924a637631f9548f36ebd53b2a7d5b19971cbb4 Mon Sep 17 00:00:00 2001
>From: John Reiser <jreiser@BitWagon.com>
>Date: Sat, 2 Feb 2013 16:08:18 -0800
>Subject: [PATCH 2/3] Allow testing without install.
>
>---
> linux-boot-prober                        | 10 ++++++++--
> linux-boot-probes/common/50mounted-tests |  5 ++++-
> os-prober                                | 10 ++++++++--
> os-probes/common/50mounted-tests         |  5 ++++-
> 4 files changed, 24 insertions(+), 6 deletions(-)
>
>diff --git a/linux-boot-prober b/linux-boot-prober
>index 6953430..eb2aa37 100755
>--- a/linux-boot-prober
>+++ b/linux-boot-prober
>@@ -28,7 +28,10 @@ if ! mapped="$(mapdevfs "$partition")"; then
> fi
> 
> if ! grep -q "^$mapped " "$OS_PROBER_TMP/mounted-map"; then
>-	for test in $libexecpfx/*; do
>+	for test in $libexecpfx/* \
>+		$libexecpfx/x86/* \
>+		$libexecpfx/common/*  # last two lines: test without install
>+	do
> 		debug "running $test"
> 		if [ -x $test ] && [ -f $test ]; then
> 			if $test "$partition"; then
>@@ -50,7 +53,10 @@ else
> 			bootpart="$partition"
> 			bootmounted=0
> 		fi
>-		for test in $libexecpfx/mounted/*; do
>+		for test in $libexecpfx/mounted/* \
>+			$libexecpfx/mounted/x86/* \
>+			$libexecpfx/mounted/common/*  # last two lines: test without install
>+		do
> 			if [ -f $test ] && [ -x $test ]; then
> 				debug "running $test on mounted $partition"
> 				if $test "$partition" "$bootpart" "$mpoint" "$type"; then
>diff --git a/linux-boot-probes/common/50mounted-tests b/linux-boot-probes/common/50mounted-tests
>index 77b4230..07f8a09 100755
>--- a/linux-boot-probes/common/50mounted-tests
>+++ b/linux-boot-probes/common/50mounted-tests
>@@ -55,7 +55,10 @@ if [ "$mounted" ]; then
> 	bootpart="${mountboot%% *}"
> 	mounted="${mountboot#* }"
> 
>-	for test in $libexecpfx/mounted/*; do
>+	for test in $libexecpfx/mounted/* \
>+		$libexecpfx/mounted/x86/* \
>+		$libexecpfx/mounted/common/*  # last two lines: test without install
>+	do
> 		if [ -f "$test" ] && [ -x "$test" ]; then
> 			debug "running $test $partition $bootpart $tmpmnt $type"
> 			if $test "$partition" "$bootpart" "$tmpmnt" "$type"; then
>diff --git a/os-prober b/os-prober
>index 1a8ebf7..bfac48e 100755
>--- a/os-prober
>+++ b/os-prober
>@@ -144,7 +144,10 @@ for partition in $(partitions); do
> 	fi
> 
> 	if ! grep -q "^$mapped " "$OS_PROBER_TMP/mounted-map" ; then
>-		for test in $libexecpfx/*; do
>+		for test in $libexecpfx/* \
>+			$libexecpfx/common/* \
>+			$libexecpfx/x86/*  # last two lines; test without install
>+		do
> 			if [ -f "$test" ] && [ -x "$test" ]; then
> 				debug "running $test on $partition"
> 				if "$test" "$partition"; then
>@@ -158,7 +161,10 @@ for partition in $(partitions); do
> 		mpoint="$(unescape_mount "$mpoint")"
> 		if [ "$mpoint" != "/target/boot" ] && [ "$mpoint" != "/target" ] && [ "$mpoint" != "/" ]; then
> 			type=$(grep "^$mapped " "$OS_PROBER_TMP/mounted-map" | head -n1 | cut -d " " -f 3)
>-			for test in $libexecpfx/mounted/*; do
>+			for test in $libexecpfx/mounted/* \
>+				$libexecpfx/mounted/common/* \
>+				$libexecpfx/mounted/x86/*  # last two lines: test without install
>+			do
> 				if [ -f "$test" ] && [ -x "$test" ]; then
> 					debug "running $test on mounted $partition"
> 					if "$test" "$partition" "$mpoint" "$type"; then
>diff --git a/os-probes/common/50mounted-tests b/os-probes/common/50mounted-tests
>index 4cf78fa..af79709 100755
>--- a/os-probes/common/50mounted-tests
>+++ b/os-probes/common/50mounted-tests
>@@ -69,7 +69,10 @@ else
> fi
> 
> if [ "$mounted" ]; then
>-	for test in $libexecpfx/mounted/*; do
>+	for test in $libexecpfx/mounted/* \
>+		$libexecpfx/mounted/common/* \
>+		$libexecpfx/mounted/x86/*  # last two lines: test without install
>+	do
> 		debug "running subtest $test"
> 		if [ -f "$test" ] && [ -x "$test" ]; then
> 			if "$test" "$partition" "$tmpmnt" "$type"; then
>-- 
>1.8.1
>

Actions: View | Diff

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