diff options
| author | Nathan Whitehorn <nwhitehorn@FreeBSD.org> | 2013-01-20 23:04:21 +0000 |
|---|---|---|
| committer | Nathan Whitehorn <nwhitehorn@FreeBSD.org> | 2013-01-20 23:04:21 +0000 |
| commit | a6b612e9206c164eff0caa74c733a4674eb095b1 (patch) | |
| tree | 44de840e3dab920027ad4b27c175b684a086532a /usr.sbin/bsdinstall/partedit/part_wizard.c | |
| parent | 5eca7e06a14cce91ad872d28b7417bb5c2506c54 (diff) | |
| download | src-test2-a6b612e9206c164eff0caa74c733a4674eb095b1.tar.gz src-test2-a6b612e9206c164eff0caa74c733a4674eb095b1.zip | |
Notes
Diffstat (limited to 'usr.sbin/bsdinstall/partedit/part_wizard.c')
| -rw-r--r-- | usr.sbin/bsdinstall/partedit/part_wizard.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr.sbin/bsdinstall/partedit/part_wizard.c b/usr.sbin/bsdinstall/partedit/part_wizard.c index e840ac95bce5..1a81c01e119f 100644 --- a/usr.sbin/bsdinstall/partedit/part_wizard.c +++ b/usr.sbin/bsdinstall/partedit/part_wizard.c @@ -42,7 +42,6 @@ static char *boot_disk(struct gmesh *mesh); static char *wizard_partition(struct gmesh *mesh, const char *disk); -static int wizard_makeparts(struct gmesh *mesh, const char *disk); int part_wizard(void) { @@ -71,7 +70,7 @@ startwizard: dlg_put_backtitle(); error = geom_gettree(&mesh); - error = wizard_makeparts(&mesh, schemeroot); + error = wizard_makeparts(&mesh, schemeroot, 1); if (error) goto startwizard; free(schemeroot); @@ -288,8 +287,8 @@ query: return (retval); } -static int -wizard_makeparts(struct gmesh *mesh, const char *disk) +int +wizard_makeparts(struct gmesh *mesh, const char *disk, int interactive) { struct gmesh submesh; struct gclass *classp; @@ -310,7 +309,7 @@ wizard_makeparts(struct gmesh *mesh, const char *disk) pp = provider_for_name(mesh, disk); available = gpart_max_free(gp, NULL)*pp->lg_sectorsize; - if (available < MIN_FREE_SPACE) { + if (interactive && available < MIN_FREE_SPACE) { char availablestr[10], neededstr[10], message[512]; humanize_number(availablestr, 7, available, "B", HN_AUTOSCALE, HN_DECIMAL); |