summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall
diff options
context:
space:
mode:
authorbrucec <brucec@FreeBSD.org>2010-07-22 17:35:36 +0000
committerbrucec <brucec@FreeBSD.org>2010-07-22 17:35:36 +0000
commitf838f2132153d8076b841baae539654d99128c33 (patch)
tree2b2c8e81090e6b938345a889fb9fd3c33118ca8c /usr.sbin/sysinstall
parente8106ea76c7b15db5ec37d17b60dc413e1cb0c3e (diff)
downloadFreeBSD-src-f838f2132153d8076b841baae539654d99128c33.zip
FreeBSD-src-f838f2132153d8076b841baae539654d99128c33.tar.gz
If a size suffix isn't entered, just use the value entered. This fixes
a bug caused by r209235 where entering a number of blocks after previously entering a size in MB/GB would result in the size of the previous partition being used. PR: bin/148266 Submitted by: jpaetzel Approved by: rrs (mentor)
Diffstat (limited to 'usr.sbin/sysinstall')
-rw-r--r--usr.sbin/sysinstall/label.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c
index ed7bdf0..0217661 100644
--- a/usr.sbin/sysinstall/label.c
+++ b/usr.sbin/sysinstall/label.c
@@ -1036,7 +1036,10 @@ diskLabel(Device *dev)
#endif
else
size = (daddr_t) dsize;
+ } else {
+ size = (daddr_t) dsize;
}
+
if (size < FS_MIN_SIZE) {
msgConfirm("The minimum filesystem size is %dMB", FS_MIN_SIZE / ONE_MEG);
clear_wins();
OpenPOWER on IntegriCloud