diff options
| author | cperciva <cperciva@FreeBSD.org> | 2006-03-24 22:45:24 +0000 |
|---|---|---|
| committer | cperciva <cperciva@FreeBSD.org> | 2006-03-24 22:45:24 +0000 |
| commit | ca5f33b3f61f30fed252c4c0e410117964de79d3 (patch) | |
| tree | 93134063a8869292cd7e109e58d9001abc180070 /usr.sbin | |
| parent | 443b2d32bc15ddd7644981020a3ffc674e2ed4d8 (diff) | |
| download | FreeBSD-src-ca5f33b3f61f30fed252c4c0e410117964de79d3.zip FreeBSD-src-ca5f33b3f61f30fed252c4c0e410117964de79d3.tar.gz | |
Only set the size of /usr to whatever-is-left is whatever-is-left is
greater than the size we autosized. Without this fix, systems with
drives under 10GB can end up with very small /usr partitions...
Broken since: January 2002
Tripped over by: simon
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/sade/label.c | 1 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/label.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c index 2a432da..21a9744 100644 --- a/usr.sbin/sade/label.c +++ b/usr.sbin/sade/label.c @@ -1522,6 +1522,7 @@ try_auto_label(Device **devs, Device *dev, int perc, int *req) if (UsrChunk == NULL && !variable_get(VAR_NO_USR)) { sz = requested_part_size(VAR_USR_SIZE, USR_NOMINAL_SIZE, USR_DEFAULT_SIZE, perc); #if AUTO_HOME == 0 + if (sz < space_free(label_chunk_info[here].c)) sz = space_free(label_chunk_info[here].c); #endif if (sz) { diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c index 2a432da..21a9744 100644 --- a/usr.sbin/sysinstall/label.c +++ b/usr.sbin/sysinstall/label.c @@ -1522,6 +1522,7 @@ try_auto_label(Device **devs, Device *dev, int perc, int *req) if (UsrChunk == NULL && !variable_get(VAR_NO_USR)) { sz = requested_part_size(VAR_USR_SIZE, USR_NOMINAL_SIZE, USR_DEFAULT_SIZE, perc); #if AUTO_HOME == 0 + if (sz < space_free(label_chunk_info[here].c)) sz = space_free(label_chunk_info[here].c); #endif if (sz) { |
