Module Name: src Committed By: martin Date: Fri Nov 16 19:54:05 UTC 2018
Modified Files: src/usr.sbin/sysinst: defsizes.h src/usr.sbin/sysinst/arch/alpha: md.h src/usr.sbin/sysinst/arch/arc: md.h src/usr.sbin/sysinst/arch/atari: md.h src/usr.sbin/sysinst/arch/cobalt: md.h src/usr.sbin/sysinst/arch/emips: md.h src/usr.sbin/sysinst/arch/ews4800mips: md.h src/usr.sbin/sysinst/arch/hp300: md.h src/usr.sbin/sysinst/arch/hppa: md.h src/usr.sbin/sysinst/arch/i386: md.h src/usr.sbin/sysinst/arch/luna68k: md.h src/usr.sbin/sysinst/arch/mipsco: md.h src/usr.sbin/sysinst/arch/mvme68k: md.h src/usr.sbin/sysinst/arch/news68k: md.h src/usr.sbin/sysinst/arch/newsmips: md.h src/usr.sbin/sysinst/arch/ofppc: md.h src/usr.sbin/sysinst/arch/pmax: md.h src/usr.sbin/sysinst/arch/prep: md.h src/usr.sbin/sysinst/arch/sgimips: md.h src/usr.sbin/sysinst/arch/sparc: md.h src/usr.sbin/sysinst/arch/sparc64: md.h src/usr.sbin/sysinst/arch/vax: md.h src/usr.sbin/sysinst/arch/x68k: md.h Log Message: Sync install size estimates with current reality To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/defsizes.h cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/alpha/md.h cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/arc/md.h cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/atari/md.h cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/cobalt/md.h cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/emips/md.h cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/ews4800mips/md.h cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/hp300/md.h cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/hppa/md.h cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/i386/md.h cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/luna68k/md.h cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/mipsco/md.h cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/mvme68k/md.h cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/news68k/md.h cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/newsmips/md.h cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/ofppc/md.h cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/pmax/md.h cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/prep/md.h cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/sgimips/md.h cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/sparc/md.h cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/sparc64/md.h cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/vax/md.h cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/x68k/md.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.sbin/sysinst/defsizes.h diff -u src/usr.sbin/sysinst/defsizes.h:1.1 src/usr.sbin/sysinst/defsizes.h:1.2 --- src/usr.sbin/sysinst/defsizes.h:1.1 Thu Nov 15 10:34:21 2018 +++ src/usr.sbin/sysinst/defsizes.h Fri Nov 16 19:54:03 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: defsizes.h,v 1.1 2018/11/15 10:34:21 martin Exp $ */ +/* $NetBSD: defsizes.h,v 1.2 2018/11/16 19:54:03 martin Exp $ */ /* * Copyright 2018 The NetBSD Foundation, Inc. @@ -43,10 +43,10 @@ #define DEFVARSIZE 32 #endif #ifndef DEFROOTSIZE -#define DEFROOTSIZE 32 +#define DEFROOTSIZE 40 #endif #ifndef DEFUSRSIZE -#define DEFUSRSIZE 128 +#define DEFUSRSIZE 800 #endif #ifndef DEFSWAPSIZE #define DEFSWAPSIZE 128 Index: src/usr.sbin/sysinst/arch/alpha/md.h diff -u src/usr.sbin/sysinst/arch/alpha/md.h:1.1 src/usr.sbin/sysinst/arch/alpha/md.h:1.2 --- src/usr.sbin/sysinst/arch/alpha/md.h:1.1 Sat Jul 26 19:30:44 2014 +++ src/usr.sbin/sysinst/arch/alpha/md.h Fri Nov 16 19:54:03 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.1 2014/07/26 19:30:44 dholland Exp $ */ +/* $NetBSD: md.h,v 1.2 2018/11/16 19:54:03 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -45,8 +45,10 @@ #define PART_USR PART_D /* Megs required for a full X installation. */ -#define XNEEDMB 50 /* XXXTHORPEJ */ +#define XNEEDMB 300 #define DEFROOTSIZE 128 +#define DEFUSRSIZE 900 +#define DEBNEEDMB 1024 /* have support for booting from UFS2 */ #define HAVE_UFS2_BOOT Index: src/usr.sbin/sysinst/arch/arc/md.h diff -u src/usr.sbin/sysinst/arch/arc/md.h:1.1 src/usr.sbin/sysinst/arch/arc/md.h:1.2 --- src/usr.sbin/sysinst/arch/arc/md.h:1.1 Sat Jul 26 19:30:44 2014 +++ src/usr.sbin/sysinst/arch/arc/md.h Fri Nov 16 19:54:03 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.1 2014/07/26 19:30:44 dholland Exp $ */ +/* $NetBSD: md.h,v 1.2 2018/11/16 19:54:03 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -66,10 +66,12 @@ #define DEFSWAPSIZE 128 /* Default swap size */ #define DEFROOTSIZE 64 /* Default root size, if created */ #define DEFVARSIZE 64 /* Default /var size, if created */ -#define DEFUSRSIZE 256 /* Default /usr size, if created */ +#define DEFUSRSIZE 750 /* Default /usr size, if created */ /* Megs required for a full X installation. */ -#define XNEEDMB 100 +#define XNEEDMB 300 + +#define DEBNEEDMB 900 /* Extra megs for debug sets */ /* have support for booting from UFS2 */ #define HAVE_UFS2_BOOT Index: src/usr.sbin/sysinst/arch/atari/md.h diff -u src/usr.sbin/sysinst/arch/atari/md.h:1.1 src/usr.sbin/sysinst/arch/atari/md.h:1.2 --- src/usr.sbin/sysinst/arch/atari/md.h:1.1 Sat Jul 26 19:30:44 2014 +++ src/usr.sbin/sysinst/arch/atari/md.h Fri Nov 16 19:54:03 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.1 2014/07/26 19:30:44 dholland Exp $ */ +/* $NetBSD: md.h,v 1.2 2018/11/16 19:54:03 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -49,10 +49,11 @@ #define PART_FIRST_FREE PART_E #define DEFSWAPRAM 32 /* Assume at least this RAM for swap calc */ -#define DEFROOTSIZE 20 /* Default root size */ +#define DEFROOTSIZE 40 /* Default root size */ #define DEFVARSIZE 32 /* Default /var size, if created */ -#define DEFUSRSIZE 70 /* Default /usr size, if /home */ -#define XNEEDMB 50 /* Extra megs for full X installation */ +#define DEFUSRSIZE 650 /* Default /usr size, if /home */ +#define XNEEDMB 250 /* Extra megs for full X installation */ +#define DEBNEEDMB 900 /* Extra megs for debug sets */ /* * Default filesets to fetch and install during installation Index: src/usr.sbin/sysinst/arch/cobalt/md.h diff -u src/usr.sbin/sysinst/arch/cobalt/md.h:1.1 src/usr.sbin/sysinst/arch/cobalt/md.h:1.2 --- src/usr.sbin/sysinst/arch/cobalt/md.h:1.1 Sat Jul 26 19:30:44 2014 +++ src/usr.sbin/sysinst/arch/cobalt/md.h Fri Nov 16 19:54:03 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.1 2014/07/26 19:30:44 dholland Exp $ */ +/* $NetBSD: md.h,v 1.2 2018/11/16 19:54:03 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -66,10 +66,12 @@ #define DEFSWAPSIZE 128 /* Default swap size */ #define DEFROOTSIZE 64 /* Default root size, if created */ #define DEFVARSIZE 64 /* Default /var size, if created */ -#define DEFUSRSIZE 256 /* Default /usr size, if created */ +#define DEFUSRSIZE 850 /* Default /usr size, if created */ /* Megs required for a full X installation. */ -#define XNEEDMB 100 +#define XNEEDMB 250 + +#define DEBNEEDMB 900 /* Extra megs for debug sets */ /* have support for booting from UFS2 */ #define HAVE_UFS2_BOOT Index: src/usr.sbin/sysinst/arch/emips/md.h diff -u src/usr.sbin/sysinst/arch/emips/md.h:1.3 src/usr.sbin/sysinst/arch/emips/md.h:1.4 --- src/usr.sbin/sysinst/arch/emips/md.h:1.3 Wed Nov 7 21:20:23 2018 +++ src/usr.sbin/sysinst/arch/emips/md.h Fri Nov 16 19:54:03 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.3 2018/11/07 21:20:23 martin Exp $ */ +/* $NetBSD: md.h,v 1.4 2018/11/16 19:54:03 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -48,8 +48,9 @@ #define DEFSWAPRAM 32 /* Assume at least this RAM for swap calc */ #define DEFROOTSIZE 64 /* Default root size */ #define DEFVARSIZE 32 /* Default /var size, if created */ -#define DEFUSRSIZE 120 /* Default /usr size, if /home */ -#define XNEEDMB 100 /* Extra megs for full X installation */ +#define DEFUSRSIZE 800 /* Default /usr size, if /home */ +#define XNEEDMB 256 /* Extra megs for full X installation */ +#define DEBNEEDMB 900 /* Extra megs for debug sets */ /* have support for booting from UFS2 */ #define HAVE_UFS2_BOOT Index: src/usr.sbin/sysinst/arch/ews4800mips/md.h diff -u src/usr.sbin/sysinst/arch/ews4800mips/md.h:1.1 src/usr.sbin/sysinst/arch/ews4800mips/md.h:1.2 --- src/usr.sbin/sysinst/arch/ews4800mips/md.h:1.1 Sat Jul 26 19:30:45 2014 +++ src/usr.sbin/sysinst/arch/ews4800mips/md.h Fri Nov 16 19:54:03 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.1 2014/07/26 19:30:45 dholland Exp $ */ +/* $NetBSD: md.h,v 1.2 2018/11/16 19:54:03 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -51,7 +51,8 @@ #define SYSVBFS_SIZE ews4800mips_sysvbfs_size() #define DEFROOTSIZE 200 /* Default root size */ -#define XNEEDMB 100 /* Extra megs for full X installation */ +#define XNEEDMB 250 /* Extra megs for full X installation */ +#define DEBNEEDMB 900 /* Extra megs for debug sets */ #define SET_KERNEL_1_NAME "kern-GENERIC" Index: src/usr.sbin/sysinst/arch/hp300/md.h diff -u src/usr.sbin/sysinst/arch/hp300/md.h:1.2 src/usr.sbin/sysinst/arch/hp300/md.h:1.3 --- src/usr.sbin/sysinst/arch/hp300/md.h:1.2 Mon Nov 5 19:45:56 2018 +++ src/usr.sbin/sysinst/arch/hp300/md.h Fri Nov 16 19:54:03 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.2 2018/11/05 19:45:56 martin Exp $ */ +/* $NetBSD: md.h,v 1.3 2018/11/16 19:54:03 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -57,10 +57,11 @@ #define PART_FIRST_FREE PART_F #define DEFSWAPRAM 32 /* Assume at least this RAM for swap calc */ -#define DEFROOTSIZE 20 /* Default root size */ +#define DEFROOTSIZE 40 /* Default root size */ #define DEFVARSIZE 32 /* Default /var size, if created */ -#define DEFUSRSIZE 240 /* Default /usr size, if created */ -#define XNEEDMB 120 /* Extra megs for full X installation */ +#define DEFUSRSIZE 700 /* Default /usr size, if created */ +#define XNEEDMB 250 /* Extra megs for full X installation */ +#define DEBNEEDMB 800 /* Extra megs for debug sets */ /* * Default filesets to fetch and install during installation Index: src/usr.sbin/sysinst/arch/hppa/md.h diff -u src/usr.sbin/sysinst/arch/hppa/md.h:1.1 src/usr.sbin/sysinst/arch/hppa/md.h:1.2 --- src/usr.sbin/sysinst/arch/hppa/md.h:1.1 Sat Jul 26 19:30:45 2014 +++ src/usr.sbin/sysinst/arch/hppa/md.h Fri Nov 16 19:54:04 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.1 2014/07/26 19:30:45 dholland Exp $ */ +/* $NetBSD: md.h,v 1.2 2018/11/16 19:54:04 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -49,8 +49,9 @@ #define DEFSWAPRAM 64 /* Assume at least this RAM for swap calc */ #define DEFROOTSIZE 64 /* Default root size */ #define DEFVARSIZE 32 /* Default /var size, if created */ -#define DEFUSRSIZE 240 /* Default /usr size, if /home */ -#define XNEEDMB 80 /* Extra megs for full X installation */ +#define DEFUSRSIZE 700 /* Default /usr size, if /home */ +#define XNEEDMB 250 /* Extra megs for full X installation */ +#define DEBNEEDMB 850 /* Extra megs for debug sets */ /* have support for booting from UFS2 */ #define HAVE_UFS2_BOOT Index: src/usr.sbin/sysinst/arch/i386/md.h diff -u src/usr.sbin/sysinst/arch/i386/md.h:1.3 src/usr.sbin/sysinst/arch/i386/md.h:1.4 --- src/usr.sbin/sysinst/arch/i386/md.h:1.3 Wed Nov 7 21:20:23 2018 +++ src/usr.sbin/sysinst/arch/i386/md.h Fri Nov 16 19:54:04 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.3 2018/11/07 21:20:23 martin Exp $ */ +/* $NetBSD: md.h,v 1.4 2018/11/16 19:54:04 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -48,10 +48,12 @@ /* constants and defines */ #define DEFUSRSIZE 0 #define DEFSWAPSIZE (-1) -#define DEFROOTSIZE 32 +#define DEFROOTSIZE 90 /* Megs required for a full X installation. */ -#define XNEEDMB 50 +#define XNEEDMB 250 + +#define DEBNEEDMB 1024 /* Extra megs for debug sets */ /* use UFS2 by default for ffs */ #define DEFAULT_UFS2 Index: src/usr.sbin/sysinst/arch/luna68k/md.h diff -u src/usr.sbin/sysinst/arch/luna68k/md.h:1.1 src/usr.sbin/sysinst/arch/luna68k/md.h:1.2 --- src/usr.sbin/sysinst/arch/luna68k/md.h:1.1 Sat Jul 26 19:30:46 2014 +++ src/usr.sbin/sysinst/arch/luna68k/md.h Fri Nov 16 19:54:04 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.1 2014/07/26 19:30:46 dholland Exp $ */ +/* $NetBSD: md.h,v 1.2 2018/11/16 19:54:04 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -53,8 +53,9 @@ #define DEFSWAPRAM 8 /* Assume at least this RAM for swap calc */ #define DEFROOTSIZE 64 /* Default root size */ #define DEFVARSIZE 64 /* Default /var size, if created */ -#define DEFUSRSIZE 200 /* Default /usr size, if created */ -#define XNEEDMB 100 /* Extra megs for full X installation */ +#define DEFUSRSIZE 750 /* Default /usr size, if created */ +#define XNEEDMB 250 /* Extra megs for full X installation */ +#define DEBNEEDMB 900 /* Extra megs for debug sets */ /* * Default filesets to fetch and install during installation Index: src/usr.sbin/sysinst/arch/mipsco/md.h diff -u src/usr.sbin/sysinst/arch/mipsco/md.h:1.1 src/usr.sbin/sysinst/arch/mipsco/md.h:1.2 --- src/usr.sbin/sysinst/arch/mipsco/md.h:1.1 Sat Jul 26 19:30:46 2014 +++ src/usr.sbin/sysinst/arch/mipsco/md.h Fri Nov 16 19:54:04 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.1 2014/07/26 19:30:46 dholland Exp $ */ +/* $NetBSD: md.h,v 1.2 2018/11/16 19:54:04 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -52,8 +52,9 @@ #define DEFSWAPRAM 32 /* Assume at least this RAM for swap calc */ #define DEFROOTSIZE 64 /* Default root size */ #define DEFVARSIZE 32 /* Default /var size, if created */ -#define DEFUSRSIZE 120 /* Default /usr size, if /home */ -#define XNEEDMB 100 /* Extra megs for full X installation */ +#define DEFUSRSIZE 750 /* Default /usr size, if /home */ +#define XNEEDMB 250 /* Extra megs for full X installation */ +#define DEBNEEDMB 900 /* Extra megs for debug sets */ /* * Default filesets to fetch and install during installation Index: src/usr.sbin/sysinst/arch/mvme68k/md.h diff -u src/usr.sbin/sysinst/arch/mvme68k/md.h:1.1 src/usr.sbin/sysinst/arch/mvme68k/md.h:1.2 --- src/usr.sbin/sysinst/arch/mvme68k/md.h:1.1 Sat Jul 26 19:30:46 2014 +++ src/usr.sbin/sysinst/arch/mvme68k/md.h Fri Nov 16 19:54:04 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.1 2014/07/26 19:30:46 dholland Exp $ */ +/* $NetBSD: md.h,v 1.2 2018/11/16 19:54:04 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -55,10 +55,11 @@ #define PART_FIRST_FREE PART_E #define DEFSWAPRAM 32 /* Assume at least this RAM for swap calc */ -#define DEFROOTSIZE 20 /* Default root size */ +#define DEFROOTSIZE 40 /* Default root size */ #define DEFVARSIZE 32 /* Default /var size, if created */ -#define DEFUSRSIZE 70 /* Default /usr size, if /home */ -#define XNEEDMB 35 /* Extra megs for full X installation */ +#define DEFUSRSIZE 700 /* Default /usr size, if /home */ +#define XNEEDMB 250 /* Extra megs for full X installation */ +#define DEBNEEDMB 800 /* Extra megs for debug sets */ /* * Default filesets to fetch and install during installation Index: src/usr.sbin/sysinst/arch/news68k/md.h diff -u src/usr.sbin/sysinst/arch/news68k/md.h:1.1 src/usr.sbin/sysinst/arch/news68k/md.h:1.2 --- src/usr.sbin/sysinst/arch/news68k/md.h:1.1 Sat Jul 26 19:30:46 2014 +++ src/usr.sbin/sysinst/arch/news68k/md.h Fri Nov 16 19:54:04 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.1 2014/07/26 19:30:46 dholland Exp $ */ +/* $NetBSD: md.h,v 1.2 2018/11/16 19:54:04 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -47,10 +47,11 @@ #define PART_FIRST_FREE PART_D #define DEFSWAPRAM 16 /* Assume at least this RAM for swap calc */ -#define DEFROOTSIZE 32 /* Default root size */ +#define DEFROOTSIZE 40 /* Default root size */ #define DEFVARSIZE 32 /* Default /var size, if created */ -#define DEFUSRSIZE 100 /* Default /usr size, if created */ -#define XNEEDMB 35 /* Extra megs for full X installation */ +#define DEFUSRSIZE 700 /* Default /usr size, if created */ +#define XNEEDMB 250 /* Extra megs for full X installation */ +#define DEBNEEDMB 800 /* Extra megs for debug sets */ /* * Default filesets to fetch and install during installation Index: src/usr.sbin/sysinst/arch/newsmips/md.h diff -u src/usr.sbin/sysinst/arch/newsmips/md.h:1.1 src/usr.sbin/sysinst/arch/newsmips/md.h:1.2 --- src/usr.sbin/sysinst/arch/newsmips/md.h:1.1 Sat Jul 26 19:30:46 2014 +++ src/usr.sbin/sysinst/arch/newsmips/md.h Fri Nov 16 19:54:04 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.1 2014/07/26 19:30:46 dholland Exp $ */ +/* $NetBSD: md.h,v 1.2 2018/11/16 19:54:04 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -49,8 +49,9 @@ #define DEFSWAPRAM 32 /* Assume at least this RAM for swap calc */ #define DEFROOTSIZE 64 /* Default root size */ #define DEFVARSIZE 32 /* Default /var size, if created */ -#define DEFUSRSIZE 120 /* Default /usr size, if created */ -#define XNEEDMB 100 /* Extra megs for full X installation */ +#define DEFUSRSIZE 800 /* Default /usr size, if created */ +#define XNEEDMB 250 /* Extra megs for full X installation */ +#define DEBNEEDMB 900 /* Extra megs for debug sets */ /* * Default filesets to fetch and install during installation Index: src/usr.sbin/sysinst/arch/ofppc/md.h diff -u src/usr.sbin/sysinst/arch/ofppc/md.h:1.1 src/usr.sbin/sysinst/arch/ofppc/md.h:1.2 --- src/usr.sbin/sysinst/arch/ofppc/md.h:1.1 Sat Jul 26 19:30:46 2014 +++ src/usr.sbin/sysinst/arch/ofppc/md.h Fri Nov 16 19:54:04 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.1 2014/07/26 19:30:46 dholland Exp $ */ +/* $NetBSD: md.h,v 1.2 2018/11/16 19:54:04 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -69,8 +69,9 @@ #define DEFSWAPSIZE 128 #define DEFROOTSIZE 64 /* Default root size */ #define DEFVARSIZE 32 /* Default /var size, if created */ -#define DEFUSRSIZE 256 /* Default /usr size, if /home */ -#define XNEEDMB 120 /* Extra megs for full X installation */ +#define DEFUSRSIZE 750 /* Default /usr size, if /home */ +#define XNEEDMB 256 /* Extra megs for full X installation */ +#define DEBNEEDMB 900 /* Extra megs for debug sets */ /* allow using tmpfs for /tmp instead of mfs */ #define HAVE_TMPFS Index: src/usr.sbin/sysinst/arch/pmax/md.h diff -u src/usr.sbin/sysinst/arch/pmax/md.h:1.2 src/usr.sbin/sysinst/arch/pmax/md.h:1.3 --- src/usr.sbin/sysinst/arch/pmax/md.h:1.2 Fri Nov 4 19:18:50 2016 +++ src/usr.sbin/sysinst/arch/pmax/md.h Fri Nov 16 19:54:04 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.2 2016/11/04 19:18:50 flxd Exp $ */ +/* $NetBSD: md.h,v 1.3 2018/11/16 19:54:04 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -48,8 +48,9 @@ #define DEFSWAPRAM 32 /* Assume at least this RAM for swap calc */ #define DEFROOTSIZE 64 /* Default root size */ #define DEFVARSIZE 32 /* Default /var size, if created */ -#define DEFUSRSIZE 120 /* Default /usr size, if /home */ -#define XNEEDMB 100 /* Extra megs for full X installation */ +#define DEFUSRSIZE 800 /* Default /usr size, if /home */ +#define XNEEDMB 256 /* Extra megs for full X installation */ +#define DEBNEEDMB 900 /* Extra megs for debug sets */ /* have support for booting from UFS2 */ #define HAVE_UFS2_BOOT Index: src/usr.sbin/sysinst/arch/prep/md.h diff -u src/usr.sbin/sysinst/arch/prep/md.h:1.1 src/usr.sbin/sysinst/arch/prep/md.h:1.2 --- src/usr.sbin/sysinst/arch/prep/md.h:1.1 Sat Jul 26 19:30:46 2014 +++ src/usr.sbin/sysinst/arch/prep/md.h Fri Nov 16 19:54:04 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.1 2014/07/26 19:30:46 dholland Exp $ */ +/* $NetBSD: md.h,v 1.2 2018/11/16 19:54:04 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -56,10 +56,11 @@ #define PART_FIRST_FREE PART_G #define DEFSWAPRAM 32 /* Assume at least this RAM for swap calc */ -#define DEFROOTSIZE 32 /* Default root size */ +#define DEFROOTSIZE 48 /* Default root size */ #define DEFVARSIZE 32 /* Default /var size, if created */ -#define DEFUSRSIZE 128 /* Default /usr size, if /home */ -#define XNEEDMB 39 /* Extra megs for full X installation */ +#define DEFUSRSIZE 720 /* Default /usr size, if /home */ +#define XNEEDMB 256 /* Extra megs for full X installation */ +#define DEBNEEDMB 950 /* Extra megs for debug sets */ /* Index: src/usr.sbin/sysinst/arch/sgimips/md.h diff -u src/usr.sbin/sysinst/arch/sgimips/md.h:1.1 src/usr.sbin/sysinst/arch/sgimips/md.h:1.2 --- src/usr.sbin/sysinst/arch/sgimips/md.h:1.1 Sat Jul 26 19:30:47 2014 +++ src/usr.sbin/sysinst/arch/sgimips/md.h Fri Nov 16 19:54:05 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.1 2014/07/26 19:30:47 dholland Exp $ */ +/* $NetBSD: md.h,v 1.2 2018/11/16 19:54:05 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -51,8 +51,9 @@ #define DEFSWAPRAM 32 /* Assume at least this RAM for swap calc */ #define DEFROOTSIZE 64 /* Default root size */ #define DEFVARSIZE 32 /* Default /var size, if created */ -#define DEFUSRSIZE 120 /* Default /usr size, if /home */ -#define XNEEDMB 100 /* Extra megs for full X installation */ +#define DEFUSRSIZE 800 /* Default /usr size, if /home */ +#define XNEEDMB 256 /* Extra megs for full X installation */ +#define DEBNEEDMB 1024 /* Extra megs for debug sets */ /* have support for booting from UFS2 */ #define HAVE_UFS2_BOOT Index: src/usr.sbin/sysinst/arch/sparc/md.h diff -u src/usr.sbin/sysinst/arch/sparc/md.h:1.2 src/usr.sbin/sysinst/arch/sparc/md.h:1.3 --- src/usr.sbin/sysinst/arch/sparc/md.h:1.2 Mon Nov 5 19:45:56 2018 +++ src/usr.sbin/sysinst/arch/sparc/md.h Fri Nov 16 19:54:05 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.2 2018/11/05 19:45:56 martin Exp $ */ +/* $NetBSD: md.h,v 1.3 2018/11/16 19:54:05 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -47,10 +47,11 @@ #define PART_FIRST_FREE PART_D #define DEFSWAPRAM 32 /* Assume at least this RAM for swap calc */ -#define DEFROOTSIZE 32 /* Default root size */ +#define DEFROOTSIZE 48 /* Default root size */ #define DEFVARSIZE 32 /* Default /var size, if created */ -#define DEFUSRSIZE 100 /* Default /usr size, if /home */ -#define XNEEDMB 35 /* Extra megs for full X installation */ +#define DEFUSRSIZE 700 /* Default /usr size, if /home */ +#define XNEEDMB 256 /* Extra megs for full X installation */ +#define DEBNEEDMB 800 /* Extra megs for debug sets */ /* have support for booting from UFS2 */ #define HAVE_UFS2_BOOT Index: src/usr.sbin/sysinst/arch/sparc64/md.h diff -u src/usr.sbin/sysinst/arch/sparc64/md.h:1.1 src/usr.sbin/sysinst/arch/sparc64/md.h:1.2 --- src/usr.sbin/sysinst/arch/sparc64/md.h:1.1 Sat Jul 26 19:30:47 2014 +++ src/usr.sbin/sysinst/arch/sparc64/md.h Fri Nov 16 19:54:05 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.1 2014/07/26 19:30:47 dholland Exp $ */ +/* $NetBSD: md.h,v 1.2 2018/11/16 19:54:05 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -50,8 +50,9 @@ #define DEFSWAPRAM 64 /* Assume at least this RAM for swap calc */ #define DEFROOTSIZE 64 /* Default root size */ #define DEFVARSIZE 32 /* Default /var size, if created */ -#define DEFUSRSIZE 240 /* Default /usr size, if /home */ -#define XNEEDMB 80 /* Extra megs for full X installation */ +#define DEFUSRSIZE 1200 /* Default /usr size, if /home */ +#define XNEEDMB 300 /* Extra megs for full X installation */ +#define DEBNEEDMB 1200 /* Extra megs for debug sets */ /* use UFS2 by default for ffs */ #define DEFAULT_UFS2 Index: src/usr.sbin/sysinst/arch/vax/md.h diff -u src/usr.sbin/sysinst/arch/vax/md.h:1.3 src/usr.sbin/sysinst/arch/vax/md.h:1.4 --- src/usr.sbin/sysinst/arch/vax/md.h:1.3 Wed Nov 7 21:20:23 2018 +++ src/usr.sbin/sysinst/arch/vax/md.h Fri Nov 16 19:54:05 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.3 2018/11/07 21:20:23 martin Exp $ */ +/* $NetBSD: md.h,v 1.4 2018/11/16 19:54:05 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -49,8 +49,9 @@ #define DEFSWAPRAM 16 /* Assume at least this RAM for swap calc */ #define DEFROOTSIZE 32 /* Default root size */ #define DEFVARSIZE 32 /* Default /var size, if created */ -#define DEFUSRSIZE 70 /* Default /usr size, if /home */ -#define XNEEDMB 35 /* Extra megs for full X installation */ +#define DEFUSRSIZE 450 /* Default /usr size, if /home */ +#define XNEEDMB 150 /* Extra megs for full X installation */ +#define DEBNEEDMB 650 /* Extra megs for debug sets */ /* * Default filesets to fetch and install during installation Index: src/usr.sbin/sysinst/arch/x68k/md.h diff -u src/usr.sbin/sysinst/arch/x68k/md.h:1.1 src/usr.sbin/sysinst/arch/x68k/md.h:1.2 --- src/usr.sbin/sysinst/arch/x68k/md.h:1.1 Sat Jul 26 19:30:47 2014 +++ src/usr.sbin/sysinst/arch/x68k/md.h Fri Nov 16 19:54:05 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.1 2014/07/26 19:30:47 dholland Exp $ */ +/* $NetBSD: md.h,v 1.2 2018/11/16 19:54:05 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -55,10 +55,11 @@ #define PART_FIRST_FREE PART_E #define DEFSWAPRAM 32 /* Assume at least this RAM for swap calc */ -#define DEFROOTSIZE 20 /* Default root size */ +#define DEFROOTSIZE 48 /* Default root size */ #define DEFVARSIZE 32 /* Default /var size, if created */ -#define DEFUSRSIZE 70 /* Default /usr size, if /home */ -#define XNEEDMB 35 /* Extra megs for full X installation */ +#define DEFUSRSIZE 1024 /* Default /usr size, if /home */ +#define XNEEDMB 256 /* Extra megs for full X installation */ +#define DEBNEEDMB 800 /* Extra megs for debug sets */ /* have support for booting from UFS2 */ #define HAVE_UFS2_BOOT