Module Name: src
Committed By: mlelstv
Date: Tue Nov 4 07:43:00 UTC 2014
Modified Files:
src/sys/dev/dkwedge: dkwedge_gpt.c
Log Message:
Be less noisy when handling wedge name conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/dkwedge/dkwedge_gpt.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/dev/dkwedge/dkwedge_gpt.c
diff -u src/sys/dev/dkwedge/dkwedge_gpt.c:1.13 src/sys/dev/dkwedge/dkwedge_gpt.c:1.14
--- src/sys/dev/dkwedge/dkwedge_gpt.c:1.13 Sat Oct 18 08:33:27 2014
+++ src/sys/dev/dkwedge/dkwedge_gpt.c Tue Nov 4 07:43:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dkwedge_gpt.c,v 1.13 2014/10/18 08:33:27 snj Exp $ */
+/* $NetBSD: dkwedge_gpt.c,v 1.14 2014/11/04 07:43:00 mlelstv Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dkwedge_gpt.c,v 1.13 2014/10/18 08:33:27 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dkwedge_gpt.c,v 1.14 2014/11/04 07:43:00 mlelstv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -265,13 +265,15 @@ dkwedge_discover_gpt(struct disk *pdk, s
* Try with the partition name first. If that fails,
* use the GUID string. If that fails, punt.
*/
- if ((error = dkwedge_add(&dkw)) == EEXIST) {
- aprint_error("%s: wedge named '%s' already exists, "
- "trying '%s'\n", pdk->dk_name,
- dkw.dkw_wname, /* XXX Unicode */
- ent_guid_str);
+ if ((error = dkwedge_add(&dkw)) == EEXIST &&
+ strcmp(dkw.dkw_wname, ent_guid_str) != 0) {
strcpy(dkw.dkw_wname, ent_guid_str);
error = dkwedge_add(&dkw);
+ if (!error)
+ aprint_error("%s: wedge named '%s' already "
+ "existed, using '%s'\n", pdk->dk_name,
+ dkw.dkw_wname, /* XXX Unicode */
+ ent_guid_str);
}
if (error == EEXIST)
aprint_error("%s: wedge named '%s' already exists, "
