Module Name: src
Committed By: jmcneill
Date: Tue Oct 20 14:49:03 UTC 2009
Modified Files:
src/sys/arch/i386/stand/lib: biosdisk.c
Log Message:
trim some fat, don't scan disklabels on non-HD disks
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/i386/stand/lib/biosdisk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/lib/biosdisk.c
diff -u src/sys/arch/i386/stand/lib/biosdisk.c:1.29 src/sys/arch/i386/stand/lib/biosdisk.c:1.30
--- src/sys/arch/i386/stand/lib/biosdisk.c:1.29 Sun Sep 13 22:45:27 2009
+++ src/sys/arch/i386/stand/lib/biosdisk.c Tue Oct 20 14:49:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: biosdisk.c,v 1.29 2009/09/13 22:45:27 jmcneill Exp $ */
+/* $NetBSD: biosdisk.c,v 1.30 2009/10/20 14:49:03 jmcneill Exp $ */
/*
* Copyright (c) 1996, 1998
@@ -319,17 +319,17 @@
d.ll.dev = 0x80 + i; /* hd/cd */
if (set_geometry(&d.ll, &ed))
continue;
+ printf("disk ");
switch (d.ll.type) {
case BIOSDISK_TYPE_CD:
- printf("disk cd0\n");
- printf(" cd0a(unknown)\n");
+ printf("cd0\n cd0a\n");
break;
case BIOSDISK_TYPE_FD:
- printf("disk fd%d\n", d.ll.dev & 0x7f);
- printf(" fd%da(unknown)\n", d.ll.dev & 0x7f);
+ printf("fd%d\n", d.ll.dev & 0x7f);
+ printf(" fd%da\n", d.ll.dev & 0x7f);
break;
case BIOSDISK_TYPE_HD:
- printf("disk hd%d", d.ll.dev & 0x7f);
+ printf("hd%d", d.ll.dev & 0x7f);
if (d.ll.flags & BIOSDISK_INT13EXT) {
printf(" size ");
size = ed.totsec * ed.sbytes;
@@ -344,6 +344,8 @@
break;
}
#ifndef NO_DISKLABEL
+ if (d.ll.type != BIOSDISK_TYPE_HD)
+ continue;
if (read_label(&d) == -1)
break;
lp = (struct disklabel *)(d.buf + LABELOFFSET);
