diff options
| author | Peter Grehan <grehan@FreeBSD.org> | 2004-04-01 01:33:37 +0000 |
|---|---|---|
| committer | Peter Grehan <grehan@FreeBSD.org> | 2004-04-01 01:33:37 +0000 |
| commit | ae33b79b67a8695385a48ddafa00784ae05082a6 (patch) | |
| tree | e988f33c6f477cab5c3ca7287ac9e026af700609 /sys/geom | |
| parent | 2f1ad18b34dfc1fccb48307f231b0ed2cbf268fa (diff) | |
| download | src-ae33b79b67a8695385a48ddafa00784ae05082a6.tar.gz src-ae33b79b67a8695385a48ddafa00784ae05082a6.zip | |
Move the name attribute to the end of the conftxt line to simplify
libdisk parsing (the name may be empty, or contain spaces).
Submitted by: Suleiman Souhlal <refugee@segfaulted.com>
Notes
Notes:
svn path=/head/; revision=127699
Diffstat (limited to 'sys/geom')
| -rw-r--r-- | sys/geom/geom_apple.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/geom/geom_apple.c b/sys/geom/geom_apple.c index f076a3a01e37..a1e8bc2b673e 100644 --- a/sys/geom/geom_apple.c +++ b/sys/geom/geom_apple.c @@ -116,11 +116,13 @@ g_apple_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp, mp = gsp->softc; g_slice_dumpconf(sb, indent, gp, cp, pp); if (pp != NULL) { - if (indent == NULL) - sbuf_printf(sb, " n %s ty %s", - mp->apmpart[pp->index].am_name, + if (indent == NULL) { + sbuf_printf(sb, " ty %s", mp->apmpart[pp->index].am_type); - else { + if (*mp->apmpart[pp->index].am_name) + sbuf_printf(sb, " sn %s", + mp->apmpart[pp->index].am_name); + } else { sbuf_printf(sb, "%s<name>%s</name>\n", indent, mp->apmpart[pp->index].am_name); sbuf_printf(sb, "%s<type>%s</type>\n", indent, |