Date: Mon, 24 Jan 2011 15:05:58 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r217785 - user/nwhitehorn/bsdinstall/partedit Message-ID: <201101241505.p0OF5w00094534@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nwhitehorn Date: Mon Jan 24 15:05:57 2011 New Revision: 217785 URL: http://svn.freebsd.org/changeset/base/217785 Log: Provide a new "Auto" button to invoke the auto-partitioner. Modified: user/nwhitehorn/bsdinstall/partedit/diskeditor.c user/nwhitehorn/bsdinstall/partedit/partedit.c Modified: user/nwhitehorn/bsdinstall/partedit/diskeditor.c ============================================================================== --- user/nwhitehorn/bsdinstall/partedit/diskeditor.c Mon Jan 24 15:04:15 2011 (r217784) +++ user/nwhitehorn/bsdinstall/partedit/diskeditor.c Mon Jan 24 15:05:57 2011 (r217785) @@ -37,7 +37,7 @@ diskeditor_show(const char *title, const WINDOW *dialog, *partitions; char *prompt; const char *buttons[] = - { "Create", "Delete", "Edit", "Revert", "Finished", NULL }; + { "Create", "Delete", "Modify", "Revert", "Auto", "Exit", NULL }; int x, y; int i; int height, width, min_width; Modified: user/nwhitehorn/bsdinstall/partedit/partedit.c ============================================================================== --- user/nwhitehorn/bsdinstall/partedit/partedit.c Mon Jan 24 15:04:15 2011 (r217784) +++ user/nwhitehorn/bsdinstall/partedit/partedit.c Mon Jan 24 15:05:57 2011 (r217785) @@ -43,11 +43,11 @@ main(int argc, const char **argv) { if (strcmp(basename(argv[0]), "autopart") == 0) { /* Guided */ prompt = "Please review the disk setup. When complete, press " - "the Finished button."; + "the Exit button."; part_wizard(); } else { prompt = "Create partitions for FreeBSD. No changes will be " - "made until you select Finished."; + "made until you select Exit."; } /* Show the part editor either immediately, or to confirm wizard */ @@ -71,7 +71,7 @@ main(int argc, const char **argv) { case 1: /* Delete */ gpart_delete((struct gprovider *)(items[i].cookie)); break; - case 2: /* Edit */ + case 2: /* Modify */ gpart_edit((struct gprovider *)(items[i].cookie)); break; case 3: /* Revert */ @@ -94,10 +94,13 @@ main(int argc, const char **argv) { } init_fstab_metadata(); break; + case 4: /* Auto */ + part_wizard(); + break; } error = 0; - if (op == 4 && validate_setup()) { /* Finished */ + if (op == 5 && validate_setup()) { /* Finished */ dialog_vars.extra_button = TRUE; dialog_vars.extra_label = __DECONST(char *, "Abort");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201101241505.p0OF5w00094534>