Module Name: src Committed By: tsutsui Date: Thu Jun 16 14:03:40 UTC 2022
Modified Files: 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/hp300: md.h src/usr.sbin/sysinst/arch/hppa: 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/playstation2: 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: Define DEFSWAPSIZE properly. DEFSWAPRAM seems obsolete. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/arc/md.h cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/atari/md.h cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/cobalt/md.h cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/emips/md.h cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/hp300/md.h cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/hppa/md.h cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/luna68k/md.h cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/mipsco/md.h cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/mvme68k/md.h cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/news68k/md.h cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/newsmips/md.h cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/ofppc/md.h cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/playstation2/md.h cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/pmax/md.h cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/prep/md.h cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/sgimips/md.h cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/sparc/md.h cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/sparc64/md.h cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/vax/md.h cvs rdiff -u -r1.5 -r1.6 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/arch/arc/md.h diff -u src/usr.sbin/sysinst/arch/arc/md.h:1.4 src/usr.sbin/sysinst/arch/arc/md.h:1.5 --- src/usr.sbin/sysinst/arch/arc/md.h:1.4 Wed Oct 2 11:16:01 2019 +++ src/usr.sbin/sysinst/arch/arc/md.h Thu Jun 16 14:03:37 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.4 2019/10/02 11:16:01 maya Exp $ */ +/* $NetBSD: md.h,v 1.5 2022/06/16 14:03:37 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -54,9 +54,8 @@ #define PART_BOOT_SUBT MBR_PTYPE_FAT12 /* default partition size */ -#define DEFSWAPRAM 32 /* Assume at least this RAM for swap calc */ +#define DEFROOTSIZE 64 /* Default root size */ #define DEFSWAPSIZE 128 /* Default swap size */ -#define DEFROOTSIZE 64 /* Default root size, if created */ #define DEFVARSIZE 64 /* Default /var size, if created */ #define DEFUSRSIZE 750 /* Default /usr size, if created */ Index: src/usr.sbin/sysinst/arch/atari/md.h diff -u src/usr.sbin/sysinst/arch/atari/md.h:1.3 src/usr.sbin/sysinst/arch/atari/md.h:1.4 --- src/usr.sbin/sysinst/arch/atari/md.h:1.3 Wed Oct 2 11:16:01 2019 +++ src/usr.sbin/sysinst/arch/atari/md.h Thu Jun 16 14:03:37 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.3 2019/10/02 11:16:01 maya Exp $ */ +/* $NetBSD: md.h,v 1.4 2022/06/16 14:03:37 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -48,8 +48,8 @@ #define PART_USR PART_D /* Can be after PART_FIRST_FREE */ #define PART_FIRST_FREE PART_E -#define DEFSWAPRAM 32 /* Assume at least this RAM for swap calc */ #define DEFROOTSIZE 40 /* Default root size */ +#define DEFSWAPSIZE 32 /* Default swap size */ #define DEFVARSIZE 32 /* Default /var size, if created */ #define DEFUSRSIZE 650 /* Default /usr size, if /home */ #define XNEEDMB 250 /* Extra megs for full X installation */ Index: src/usr.sbin/sysinst/arch/cobalt/md.h diff -u src/usr.sbin/sysinst/arch/cobalt/md.h:1.6 src/usr.sbin/sysinst/arch/cobalt/md.h:1.7 --- src/usr.sbin/sysinst/arch/cobalt/md.h:1.6 Wed Jun 10 16:26:33 2020 +++ src/usr.sbin/sysinst/arch/cobalt/md.h Thu Jun 16 14:03:38 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.6 2020/06/10 16:26:33 tsutsui Exp $ */ +/* $NetBSD: md.h,v 1.7 2022/06/16 14:03:38 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -52,9 +52,8 @@ #define PART_BOOT_MOUNT "/ext2" /* default partition size */ -#define DEFSWAPRAM 32 /* Assume at least this RAM for swap calc */ +#define DEFROOTSIZE 64 /* Default root size */ #define DEFSWAPSIZE 128 /* Default swap size */ -#define DEFROOTSIZE 64 /* Default root size, if created */ #define DEFVARSIZE 64 /* Default /var size, if created */ #define DEFUSRSIZE 850 /* Default /usr size, if created */ Index: src/usr.sbin/sysinst/arch/emips/md.h diff -u src/usr.sbin/sysinst/arch/emips/md.h:1.5 src/usr.sbin/sysinst/arch/emips/md.h:1.6 --- src/usr.sbin/sysinst/arch/emips/md.h:1.5 Wed Oct 2 11:16:02 2019 +++ src/usr.sbin/sysinst/arch/emips/md.h Thu Jun 16 14:03:38 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.5 2019/10/02 11:16:02 maya Exp $ */ +/* $NetBSD: md.h,v 1.6 2022/06/16 14:03:38 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -45,8 +45,8 @@ #define PART_USR PART_D /* Can be after PART_FIRST_FREE */ #define PART_FIRST_FREE PART_E -#define DEFSWAPRAM 32 /* Assume at least this RAM for swap calc */ #define DEFROOTSIZE 64 /* Default root size */ +#define DEFSWAPSIZE 32 /* Default swap size */ #define DEFVARSIZE 32 /* Default /var size, if created */ #define DEFUSRSIZE 800 /* Default /usr size, if /home */ #define XNEEDMB 256 /* Extra megs for full X installation */ Index: src/usr.sbin/sysinst/arch/hp300/md.h diff -u src/usr.sbin/sysinst/arch/hp300/md.h:1.5 src/usr.sbin/sysinst/arch/hp300/md.h:1.6 --- src/usr.sbin/sysinst/arch/hp300/md.h:1.5 Wed Oct 2 11:16:02 2019 +++ src/usr.sbin/sysinst/arch/hp300/md.h Thu Jun 16 14:03:38 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.5 2019/10/02 11:16:02 maya Exp $ */ +/* $NetBSD: md.h,v 1.6 2022/06/16 14:03:38 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -50,8 +50,8 @@ */ #define BOOT_SIZE hp300_boot_size() -#define DEFSWAPRAM 32 /* Assume at least this RAM for swap calc */ #define DEFROOTSIZE 40 /* Default root size */ +#define DEFSWAPSIZE 32 /* Default swap size */ #define DEFVARSIZE 32 /* Default /var size, if created */ #define DEFUSRSIZE 700 /* Default /usr size, if created */ #define XNEEDMB 250 /* Extra megs for full X installation */ Index: src/usr.sbin/sysinst/arch/hppa/md.h diff -u src/usr.sbin/sysinst/arch/hppa/md.h:1.2 src/usr.sbin/sysinst/arch/hppa/md.h:1.3 --- src/usr.sbin/sysinst/arch/hppa/md.h:1.2 Fri Nov 16 19:54:04 2018 +++ src/usr.sbin/sysinst/arch/hppa/md.h Thu Jun 16 14:03:38 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.2 2018/11/16 19:54:04 martin Exp $ */ +/* $NetBSD: md.h,v 1.3 2022/06/16 14:03:38 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -46,8 +46,8 @@ #define PART_USR PART_D /* Can be after PART_FIRST_FREE */ #define PART_FIRST_FREE PART_E -#define DEFSWAPRAM 64 /* Assume at least this RAM for swap calc */ #define DEFROOTSIZE 64 /* Default root size */ +#define DEFSWAPSIZE 64 /* Default swap size */ #define DEFVARSIZE 32 /* Default /var size, if created */ #define DEFUSRSIZE 700 /* Default /usr size, if /home */ #define XNEEDMB 250 /* Extra megs for full X installation */ Index: src/usr.sbin/sysinst/arch/luna68k/md.h diff -u src/usr.sbin/sysinst/arch/luna68k/md.h:1.3 src/usr.sbin/sysinst/arch/luna68k/md.h:1.4 --- src/usr.sbin/sysinst/arch/luna68k/md.h:1.3 Wed Jun 12 06:20:21 2019 +++ src/usr.sbin/sysinst/arch/luna68k/md.h Thu Jun 16 14:03:38 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.3 2019/06/12 06:20:21 martin Exp $ */ +/* $NetBSD: md.h,v 1.4 2022/06/16 14:03:38 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -45,8 +45,8 @@ #define PART_BOOT_TYPE FS_BSDFFS #define PART_BOOT_SUBT 1 /* old 4.3BSD UFS */ -#define DEFSWAPRAM 8 /* Assume at least this RAM for swap calc */ #define DEFROOTSIZE 64 /* Default root size */ +#define DEFSWAPSIZE 32 /* Default swap size */ #define DEFVARSIZE 64 /* Default /var size, if created */ #define DEFUSRSIZE 750 /* Default /usr size, if created */ #define XNEEDMB 250 /* Extra megs for full X installation */ Index: src/usr.sbin/sysinst/arch/mipsco/md.h diff -u src/usr.sbin/sysinst/arch/mipsco/md.h:1.2 src/usr.sbin/sysinst/arch/mipsco/md.h:1.3 --- src/usr.sbin/sysinst/arch/mipsco/md.h:1.2 Fri Nov 16 19:54:04 2018 +++ src/usr.sbin/sysinst/arch/mipsco/md.h Thu Jun 16 14:03:38 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.2 2018/11/16 19:54:04 martin Exp $ */ +/* $NetBSD: md.h,v 1.3 2022/06/16 14:03:38 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -49,8 +49,8 @@ #define PART_USR PART_D /* Can be after PART_FIRST_FREE */ #define PART_FIRST_FREE PART_E -#define DEFSWAPRAM 32 /* Assume at least this RAM for swap calc */ #define DEFROOTSIZE 64 /* Default root size */ +#define DEFSWAPSIZE 32 /* Default swap size */ #define DEFVARSIZE 32 /* Default /var size, if created */ #define DEFUSRSIZE 750 /* Default /usr size, if /home */ #define XNEEDMB 250 /* Extra megs for full X installation */ Index: src/usr.sbin/sysinst/arch/mvme68k/md.h diff -u src/usr.sbin/sysinst/arch/mvme68k/md.h:1.3 src/usr.sbin/sysinst/arch/mvme68k/md.h:1.4 --- src/usr.sbin/sysinst/arch/mvme68k/md.h:1.3 Wed Oct 2 11:16:03 2019 +++ src/usr.sbin/sysinst/arch/mvme68k/md.h Thu Jun 16 14:03:38 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.3 2019/10/02 11:16:03 maya Exp $ */ +/* $NetBSD: md.h,v 1.4 2022/06/16 14:03:38 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -54,8 +54,8 @@ #define PART_USR PART_D /* Can be after PART_FIRST_FREE */ #define PART_FIRST_FREE PART_E -#define DEFSWAPRAM 32 /* Assume at least this RAM for swap calc */ #define DEFROOTSIZE 40 /* Default root size */ +#define DEFSWAPSIZE 32 /* Default swap size */ #define DEFVARSIZE 32 /* Default /var size, if created */ #define DEFUSRSIZE 700 /* Default /usr size, if /home */ #define XNEEDMB 250 /* Extra megs for full X installation */ Index: src/usr.sbin/sysinst/arch/news68k/md.h diff -u src/usr.sbin/sysinst/arch/news68k/md.h:1.2 src/usr.sbin/sysinst/arch/news68k/md.h:1.3 --- src/usr.sbin/sysinst/arch/news68k/md.h:1.2 Fri Nov 16 19:54:04 2018 +++ src/usr.sbin/sysinst/arch/news68k/md.h Thu Jun 16 14:03:38 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.2 2018/11/16 19:54:04 martin Exp $ */ +/* $NetBSD: md.h,v 1.3 2022/06/16 14:03:38 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -46,8 +46,8 @@ #define PART_USR PART_G /* Can be after PART_FIRST_FREE */ #define PART_FIRST_FREE PART_D -#define DEFSWAPRAM 16 /* Assume at least this RAM for swap calc */ #define DEFROOTSIZE 40 /* Default root size */ +#define DEFSWAPSIZE 32 /* Default swap size */ #define DEFVARSIZE 32 /* Default /var size, if created */ #define DEFUSRSIZE 700 /* Default /usr size, if created */ #define XNEEDMB 250 /* Extra megs for full X installation */ Index: src/usr.sbin/sysinst/arch/newsmips/md.h diff -u src/usr.sbin/sysinst/arch/newsmips/md.h:1.2 src/usr.sbin/sysinst/arch/newsmips/md.h:1.3 --- src/usr.sbin/sysinst/arch/newsmips/md.h:1.2 Fri Nov 16 19:54:04 2018 +++ src/usr.sbin/sysinst/arch/newsmips/md.h Thu Jun 16 14:03:38 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.2 2018/11/16 19:54:04 martin Exp $ */ +/* $NetBSD: md.h,v 1.3 2022/06/16 14:03:38 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -46,8 +46,8 @@ #define PART_USR PART_G /* Can be after PART_FIRST_FREE */ #define PART_FIRST_FREE PART_D -#define DEFSWAPRAM 32 /* Assume at least this RAM for swap calc */ #define DEFROOTSIZE 64 /* Default root size */ +#define DEFSWAPSIZE 32 /* Default swap size */ #define DEFVARSIZE 32 /* Default /var size, if created */ #define DEFUSRSIZE 800 /* Default /usr size, if created */ #define XNEEDMB 250 /* Extra megs for full X installation */ Index: src/usr.sbin/sysinst/arch/ofppc/md.h diff -u src/usr.sbin/sysinst/arch/ofppc/md.h:1.4 src/usr.sbin/sysinst/arch/ofppc/md.h:1.5 --- src/usr.sbin/sysinst/arch/ofppc/md.h:1.4 Wed Oct 2 11:16:03 2019 +++ src/usr.sbin/sysinst/arch/ofppc/md.h Thu Jun 16 14:03:39 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.4 2019/10/02 11:16:03 maya Exp $ */ +/* $NetBSD: md.h,v 1.5 2022/06/16 14:03:39 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -65,9 +65,8 @@ #define PART_BOOT2_TYPE FS_BOOT -#define DEFSWAPRAM 32 /* Assume at least this RAM for swap calc */ -#define DEFSWAPSIZE 128 #define DEFROOTSIZE 64 /* Default root size */ +#define DEFSWAPSIZE 128 /* Default swap size */ #define DEFVARSIZE 32 /* Default /var size, if created */ #define DEFUSRSIZE 750 /* Default /usr size, if /home */ #define XNEEDMB 256 /* Extra megs for full X installation */ Index: src/usr.sbin/sysinst/arch/playstation2/md.h diff -u src/usr.sbin/sysinst/arch/playstation2/md.h:1.2 src/usr.sbin/sysinst/arch/playstation2/md.h:1.3 --- src/usr.sbin/sysinst/arch/playstation2/md.h:1.2 Wed Oct 2 11:16:03 2019 +++ src/usr.sbin/sysinst/arch/playstation2/md.h Thu Jun 16 14:03:39 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.2 2019/10/02 11:16:03 maya Exp $ */ +/* $NetBSD: md.h,v 1.3 2022/06/16 14:03:39 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -53,8 +53,8 @@ #define PART_USR PART_D #define PART_FIRST_FREE PART_D -#define DEFSWAPRAM 64 /* Assume at least this RAM for swap calc */ #define DEFROOTSIZE 32 /* Default root size */ +#define DEFSWAPSIZE 64 /* Default swap size */ #define DEFVARSIZE 0 /* Default /var size, if created */ #define DEFUSRSIZE 0 /* Default /usr size, if created */ #define XNEEDMB 0 /* Extra megs for full X installation(not yet)*/ Index: src/usr.sbin/sysinst/arch/pmax/md.h diff -u src/usr.sbin/sysinst/arch/pmax/md.h:1.4 src/usr.sbin/sysinst/arch/pmax/md.h:1.5 --- src/usr.sbin/sysinst/arch/pmax/md.h:1.4 Wed Oct 2 11:16:03 2019 +++ src/usr.sbin/sysinst/arch/pmax/md.h Thu Jun 16 14:03:39 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.4 2019/10/02 11:16:03 maya Exp $ */ +/* $NetBSD: md.h,v 1.5 2022/06/16 14:03:39 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -45,8 +45,8 @@ #define PART_USR PART_D /* Can be after PART_FIRST_FREE */ #define PART_FIRST_FREE PART_E -#define DEFSWAPRAM 32 /* Assume at least this RAM for swap calc */ #define DEFROOTSIZE 64 /* Default root size */ +#define DEFSWAPSIZE 32 /* Default swap size */ #define DEFVARSIZE 32 /* Default /var size, if created */ #define DEFUSRSIZE 800 /* Default /usr size, if /home */ #define XNEEDMB 256 /* Extra megs for full X installation */ Index: src/usr.sbin/sysinst/arch/prep/md.h diff -u src/usr.sbin/sysinst/arch/prep/md.h:1.4 src/usr.sbin/sysinst/arch/prep/md.h:1.5 --- src/usr.sbin/sysinst/arch/prep/md.h:1.4 Wed Oct 2 11:16:03 2019 +++ src/usr.sbin/sysinst/arch/prep/md.h Thu Jun 16 14:03:39 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.4 2019/10/02 11:16:03 maya Exp $ */ +/* $NetBSD: md.h,v 1.5 2022/06/16 14:03:39 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -50,8 +50,8 @@ #define PART_BOOT PREP_BOOT_SIZE #define PART_BOOT_TYPE FS_BOOT -#define DEFSWAPRAM 32 /* Assume at least this RAM for swap calc */ #define DEFROOTSIZE 48 /* Default root size */ +#define DEFSWAPSIZE 32 /* Default swap size */ #define DEFVARSIZE 32 /* Default /var size, if created */ #define DEFUSRSIZE 720 /* Default /usr size, if /home */ #define XNEEDMB 256 /* Extra megs for full X installation */ Index: src/usr.sbin/sysinst/arch/sgimips/md.h diff -u src/usr.sbin/sysinst/arch/sgimips/md.h:1.4 src/usr.sbin/sysinst/arch/sgimips/md.h:1.5 --- src/usr.sbin/sysinst/arch/sgimips/md.h:1.4 Wed Oct 2 11:16:03 2019 +++ src/usr.sbin/sysinst/arch/sgimips/md.h Thu Jun 16 14:03:39 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.4 2019/10/02 11:16:03 maya Exp $ */ +/* $NetBSD: md.h,v 1.5 2022/06/16 14:03:39 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -41,8 +41,8 @@ */ #define PART_BOOT (4 * MEG) /* Enough for a GENERIC kernel */ -#define DEFSWAPRAM 32 /* Assume at least this RAM for swap calc */ #define DEFROOTSIZE 64 /* Default root size */ +#define DEFSWAPSIZE 32 /* Default swap size */ #define DEFVARSIZE 32 /* Default /var size, if created */ #define DEFUSRSIZE 800 /* Default /usr size, if /home */ #define XNEEDMB 256 /* Extra megs for full X installation */ Index: src/usr.sbin/sysinst/arch/sparc/md.h diff -u src/usr.sbin/sysinst/arch/sparc/md.h:1.4 src/usr.sbin/sysinst/arch/sparc/md.h:1.5 --- src/usr.sbin/sysinst/arch/sparc/md.h:1.4 Thu Jun 20 18:32:33 2019 +++ src/usr.sbin/sysinst/arch/sparc/md.h Thu Jun 16 14:03:39 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.4 2019/06/20 18:32:33 martin Exp $ */ +/* $NetBSD: md.h,v 1.5 2022/06/16 14:03:39 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -46,8 +46,8 @@ #define PART_USR PART_G /* Can be after PART_FIRST_FREE */ #define PART_FIRST_FREE PART_D -#define DEFSWAPRAM 32 /* Assume at least this RAM for swap calc */ #define DEFROOTSIZE 48 /* Default root size */ +#define DEFSWAPSIZE 32 /* Default swap size */ #define DEFVARSIZE 32 /* Default /var size, if created */ #define DEFUSRSIZE 700 /* Default /usr size, if /home */ #define XNEEDMB 256 /* Extra megs for full X installation */ Index: src/usr.sbin/sysinst/arch/sparc64/md.h diff -u src/usr.sbin/sysinst/arch/sparc64/md.h:1.5 src/usr.sbin/sysinst/arch/sparc64/md.h:1.6 --- src/usr.sbin/sysinst/arch/sparc64/md.h:1.5 Thu Jun 20 18:32:33 2019 +++ src/usr.sbin/sysinst/arch/sparc64/md.h Thu Jun 16 14:03:39 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.5 2019/06/20 18:32:33 martin Exp $ */ +/* $NetBSD: md.h,v 1.6 2022/06/16 14:03:39 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -47,8 +47,8 @@ #define PART_USR PART_G /* Can be after PART_FIRST_FREE */ #define PART_FIRST_FREE PART_D -#define DEFSWAPRAM 64 /* Assume at least this RAM for swap calc */ #define DEFROOTSIZE 64 /* Default root size */ +#define DEFSWAPSIZE 64 /* Default swap size */ #define DEFVARSIZE 32 /* Default /var size, if created */ #define DEFUSRSIZE 1200 /* Default /usr size, if /home */ #define XNEEDMB 300 /* Extra megs for full X installation */ Index: src/usr.sbin/sysinst/arch/vax/md.h diff -u src/usr.sbin/sysinst/arch/vax/md.h:1.4 src/usr.sbin/sysinst/arch/vax/md.h:1.5 --- src/usr.sbin/sysinst/arch/vax/md.h:1.4 Fri Nov 16 19:54:05 2018 +++ src/usr.sbin/sysinst/arch/vax/md.h Thu Jun 16 14:03:39 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.4 2018/11/16 19:54:05 martin Exp $ */ +/* $NetBSD: md.h,v 1.5 2022/06/16 14:03:39 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -46,8 +46,8 @@ #define PART_USR PART_D /* Can be after PART_FIRST_FREE */ #define PART_FIRST_FREE PART_E -#define DEFSWAPRAM 16 /* Assume at least this RAM for swap calc */ #define DEFROOTSIZE 32 /* Default root size */ +#define DEFSWAPSIZE 16 /* Default swap size */ #define DEFVARSIZE 32 /* Default /var size, if created */ #define DEFUSRSIZE 450 /* Default /usr size, if /home */ #define XNEEDMB 150 /* Extra megs for full X installation */ Index: src/usr.sbin/sysinst/arch/x68k/md.h diff -u src/usr.sbin/sysinst/arch/x68k/md.h:1.5 src/usr.sbin/sysinst/arch/x68k/md.h:1.6 --- src/usr.sbin/sysinst/arch/x68k/md.h:1.5 Sun Dec 5 04:42:55 2021 +++ src/usr.sbin/sysinst/arch/x68k/md.h Thu Jun 16 14:03:39 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.5 2021/12/05 04:42:55 msaitoh Exp $ */ +/* $NetBSD: md.h,v 1.6 2022/06/16 14:03:39 tsutsui Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -54,8 +54,8 @@ #define PART_USR PART_D /* Can be after PART_FIRST_FREE */ #define PART_FIRST_FREE PART_E -#define DEFSWAPRAM 32 /* Assume at least this RAM for swap calc */ #define DEFROOTSIZE 48 /* Default root size */ +#define DEFSWAPSIZE 32 /* Default swap size */ #define DEFVARSIZE 32 /* Default /var size, if created */ #define DEFUSRSIZE 1024 /* Default /usr size, if /home */ #define XNEEDMB 256 /* Extra megs for full X installation */