Date: Sat, 19 Feb 2011 15:22:06 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r218855 - head/usr.sbin/bsdinstall/partedit Message-ID: <201102191522.p1JFM6s8000402@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nwhitehorn Date: Sat Feb 19 15:22:06 2011 New Revision: 218855 URL: http://svn.freebsd.org/changeset/base/218855 Log: Don't present the user with spurious errors when overwriting a disk with a deleted, but uncommitted, gpart. Reported by: brucec Modified: head/usr.sbin/bsdinstall/partedit/part_wizard.c Modified: head/usr.sbin/bsdinstall/partedit/part_wizard.c ============================================================================== --- head/usr.sbin/bsdinstall/partedit/part_wizard.c Sat Feb 19 14:57:00 2011 (r218854) +++ head/usr.sbin/bsdinstall/partedit/part_wizard.c Sat Feb 19 15:22:06 2011 (r218855) @@ -213,6 +213,10 @@ wizard_partition(struct gmesh *mesh, con } } + /* Treat uncommitted scheme deletions as no scheme */ + if (scheme != NULL && strcmp(scheme, "(none)") == 0) + scheme = NULL; + query: dialog_vars.yes_label = "Entire Disk"; dialog_vars.no_label = "Partition"; @@ -247,8 +251,9 @@ query: scheme = default_scheme(); } - if (scheme == NULL || strcmp(scheme, "(none)") == 0 || choice == 0) { - if (gpart != NULL) { /* Erase partitioned disk */ + if (scheme == NULL || choice == 0) { + if (gpart != NULL && scheme != NULL) { + /* Erase partitioned disk */ choice = dialog_yesno("Confirmation", "This will erase " "the disk. Are you sure you want to proceed?", 0, 0); if (choice != 0)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201102191522.p1JFM6s8000402>