Page MenuHomeFreeBSD
Files F134678618

D14574.diff
No OneTemporary
Actions

D14574.diff
View Options

Index: usr.sbin/bsdinstall/partedit/gpart_ops.c
===================================================================
--- usr.sbin/bsdinstall/partedit/gpart_ops.c
+++ usr.sbin/bsdinstall/partedit/gpart_ops.c
@@ -680,6 +680,14 @@
/* Set part metadata */
md = get_part_metadata(name, 1);
+ if (strcmp("freebsd-zfs", type) == 0) {
+ zpool_name = strdup((strlen(mountpoint) == 1) ?
+ "root" : &mountpoint[1]);
+ for (i = 0; zpool_name[i] != 0; i++)
+ if (!isalnum(zpool_name[i]))
+ zpool_name[i] = '_';
+ }
+
if (newfs) {
if (md->newfs != NULL) {
free(md->newfs);
@@ -690,11 +698,6 @@
md->newfs = malloc(strlen(newfs) + strlen(" /dev/") +
strlen(mountpoint) + 5 + strlen(name) + 1);
if (strcmp("freebsd-zfs", type) == 0) {
- zpool_name = strdup((strlen(mountpoint) == 1) ?
- "root" : &mountpoint[1]);
- for (i = 0; zpool_name[i] != 0; i++)
- if (!isalnum(zpool_name[i]))
- zpool_name[i] = '_';
sprintf(md->newfs, "%s %s /dev/%s", newfs,
zpool_name, name);
} else {
@@ -774,8 +777,7 @@
md->fstab->fs_mntops = strdup(md->fstab->fs_type);
}
- if (zpool_name != NULL)
- free(zpool_name);
+ free(zpool_name);
}
static

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 4, 11:49 PM (9 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
24791509
Default Alt Text
D14574.diff (1 KB)

Event Timeline