aboutsummaryrefslogtreecommitdiffstats
path: root/dosutil/mdiskchk.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-06-19 19:08:39 -0700
committerH. Peter Anvin <hpa@zytor.com>2010-06-19 19:08:39 -0700
commitbf0617aecb78a5dbe54962c05d533efd074f7902 (patch)
tree167f17e2dddd9d5c40a26c2399db8a8c214a6c05 /dosutil/mdiskchk.c
parent9f1407746a1154a2dc456059e5f223bc689e8f4b (diff)
parent107806f9ab7e87b0535944606d53b07dca291b1c (diff)
downloadsyslinux-bf0617aecb78a5dbe54962c05d533efd074f7902.tar.gz
syslinux-bf0617aecb78a5dbe54962c05d533efd074f7902.tar.xz
syslinux-bf0617aecb78a5dbe54962c05d533efd074f7902.zip
Merge remote branch 'sha0/for_hpa' into pathbased
Diffstat (limited to 'dosutil/mdiskchk.c')
-rw-r--r--dosutil/mdiskchk.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/dosutil/mdiskchk.c b/dosutil/mdiskchk.c
index ddc57632..f7bde614 100644
--- a/dosutil/mdiskchk.c
+++ b/dosutil/mdiskchk.c
@@ -200,7 +200,8 @@ static MDISKCHK_FUNC_DECL(show_usage)
"Action: --safe-hooks . . Will scan INT 13h \"safe hook\" chain\n"
" --mbfts . . . . Will scan memory for MEMDISK mBFTs\n"
" --batch-output . Will output SET command output based\n"
- " on MEMDISK kernel arguments\n");
+ " on MEMDISK kernel arguments\n"
+ " --no-sequential Suppresses probing all drive numbers\n");
}
/* Search memory for mBFTs and report them via the output method */
@@ -297,6 +298,7 @@ int main(int argc, char *argv[])
{
int d;
int found = 0;
+ int sequential_scan = 1; /* Classic behaviour */
const struct memdiskinfo *m;
/* Default behaviour */
@@ -331,6 +333,10 @@ int main(int argc, char *argv[])
case 'b':
show_memdisk = batch_output;
break;
+ case 'N':
+ case 'n':
+ sequential_scan = 0;
+ break;
default:
usage = show_usage;
} /* switch */
@@ -338,6 +344,8 @@ int main(int argc, char *argv[])
safe_hooks();
mbfts();
+ if (!sequential_scan)
+ goto skip_sequential;
for (d = 0; d <= 0xff; d++) {
m = query_memdisk(d);
if (m != NULL) {
@@ -345,6 +353,7 @@ int main(int argc, char *argv[])
show_memdisk(d, m);
}
}
+skip_sequential:
usage();
return found;