diff options
author | grog <grog@FreeBSD.org> | 2001-05-22 02:32:22 +0000 |
---|---|---|
committer | grog <grog@FreeBSD.org> | 2001-05-22 02:32:22 +0000 |
commit | e7843236bc58f636de95336b051aee3e3a01c43b (patch) | |
tree | c6feff01e00d79d8d5c608fd7be02bc2f230f8f6 | |
parent | aa9ab5296b71394518487f31cde37fa4e0702ce6 (diff) | |
download | FreeBSD-src-e7843236bc58f636de95336b051aee3e3a01c43b.zip FreeBSD-src-e7843236bc58f636de95336b051aee3e3a01c43b.tar.gz |
format_config: Replace long format lines.
Requested by: bde
Add retryerrors keyword.
vinum_scandisk: Print a different message if an inadvertent start
command did not find any additional drives. The previous message "no
drives found" confused and worried many people.
MFS:
vinum_open: Recognize Mylex devices as storage devices.
-rw-r--r-- | sys/dev/vinum/vinumio.c | 46 |
1 files changed, 28 insertions, 18 deletions
diff --git a/sys/dev/vinum/vinumio.c b/sys/dev/vinum/vinumio.c index 584915f..7e10209 100644 --- a/sys/dev/vinum/vinumio.c +++ b/sys/dev/vinum/vinumio.c @@ -87,6 +87,9 @@ open_drive(struct drive *drive, struct proc *p, int verbose) else if (bcmp(dname, "amrd", 4) == 0) { devmajor = 133; dname += 2; + } else if (bcmp(dname, "mlxd", 4) == 0) { + devmajor = 131; + dname += 2; } else if (bcmp(dname, "idad", 4) == 0) { devmajor = 109; dname += 2; @@ -552,28 +555,32 @@ format_config(char *config, int len) */ if (drivename[0] == '\0') drivename = "*invalid*"; + snprintf(s, + configend - s, + "sd name %s drive %s plex %s len %llus driveoffset %llus state %s", + sd->name, + drivename, + vinum_conf.plex[sd->plexno].name, + (unsigned long long) sd->sectors, + (unsigned long long) sd->driveoffset, + sd_state(sd->state)); + while (*s) + s++; /* find the end */ if (sd->plexno >= 0) snprintf(s, configend - s, - "sd name %s drive %s plex %s state %s " - "len %llus driveoffset %llus plexoffset %llds\n", - sd->name, - drivename, - vinum_conf.plex[sd->plexno].name, - sd_state(sd->state), - (unsigned long long) sd->sectors, - (unsigned long long) sd->driveoffset, + " plexoffset %llds", (long long) sd->plexoffset); else - snprintf(s, - configend - s, - "sd name %s drive %s state %s " - "len %llus driveoffset %llus detached\n", - sd->name, - drivename, - sd_state(sd->state), - (unsigned long long) sd->sectors, - (unsigned long long) sd->driveoffset); + snprintf(s, configend - s, " detached"); + while (*s) + s++; /* find the end */ + if (sd->flags & VF_RETRYERRORS) { + snprintf(s, configend - s, " retryerrors"); + while (*s) + s++; /* find the end */ + } + snprintf(s, configend - s, " \n"); while (*s) s++; /* find the end */ } @@ -900,7 +907,10 @@ vinum_scandisk(char *devicename[], int drives) } if (gooddrives == 0) { - log(LOG_WARNING, "vinum: no drives found\n"); + if (firsttime) + log(LOG_WARNING, "vinum: no drives found\n"); + else + log(LOG_INFO, "vinum: no additional drives found\n"); return ENOENT; } /* |