Module Name: src
Committed By: ad
Date: Sat Apr 4 11:34:09 UTC 2009
Modified Files:
src/distrib/utils/sysinst: bsddisklabel.c
Log Message:
Back out the / change. This is an incorrigible. Any change to that would
make it more user friendly is likely to (a) trigger complaints from elitist
morons (b) overflow RAM disks everywhere.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/distrib/utils/sysinst/bsddisklabel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/bsddisklabel.c
diff -u src/distrib/utils/sysinst/bsddisklabel.c:1.48 src/distrib/utils/sysinst/bsddisklabel.c:1.49
--- src/distrib/utils/sysinst/bsddisklabel.c:1.48 Sat Apr 4 11:24:24 2009
+++ src/distrib/utils/sysinst/bsddisklabel.c Sat Apr 4 11:34:09 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bsddisklabel.c,v 1.48 2009/04/04 11:24:24 ad Exp $ */
+/* $NetBSD: bsddisklabel.c,v 1.49 2009/04/04 11:34:09 ad Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -444,12 +444,6 @@
pi.free_space -= i;
}
- /* If no /usr and still free space, give to / */
- if (pi.ptn_sizes[PI_USR].size == 0 && pi.free_space != 0) {
- pi.ptn_sizes[PI_ROOT].size += pi.free_space;
- pi.free_space = 0;
- }
-
/* Ensure all of / is readable by the system boot code */
i = pi.ptn_sizes[PI_ROOT].limit;
if (i != 0 && (i -= pi.ptn_sizes[PI_ROOT].size) < 0) {
