diff --git a/usr.sbin/sysinst/arch/arc/md.h b/usr.sbin/sysinst/arch/arc/md.h index 090fd54cdfe4..3f4bb98502db 100644 --- a/usr.sbin/sysinst/arch/arc/md.h +++ b/usr.sbin/sysinst/arch/arc/md.h @@ -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 */ diff --git a/usr.sbin/sysinst/arch/atari/md.h b/usr.sbin/sysinst/arch/atari/md.h index 75c83a2470b7..8277abea6db8 100644 --- a/usr.sbin/sysinst/arch/atari/md.h +++ b/usr.sbin/sysinst/arch/atari/md.h @@ -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 */ diff --git a/usr.sbin/sysinst/arch/cobalt/md.h b/usr.sbin/sysinst/arch/cobalt/md.h index 9b697c9899b6..0a56185bf293 100644 --- a/usr.sbin/sysinst/arch/cobalt/md.h +++ b/usr.sbin/sysinst/arch/cobalt/md.h @@ -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 */ diff --git a/usr.sbin/sysinst/arch/emips/md.h b/usr.sbin/sysinst/arch/emips/md.h index b0918e28f3ce..8d05d6c3eebe 100644 --- a/usr.sbin/sysinst/arch/emips/md.h +++ b/usr.sbin/sysinst/arch/emips/md.h @@ -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 */ diff --git a/usr.sbin/sysinst/arch/hp300/md.h b/usr.sbin/sysinst/arch/hp300/md.h index 1bdbd4338a0a..35367c2f250b 100644 --- a/usr.sbin/sysinst/arch/hp300/md.h +++ b/usr.sbin/sysinst/arch/hp300/md.h @@ -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 */ diff --git a/usr.sbin/sysinst/arch/hppa/md.h b/usr.sbin/sysinst/arch/hppa/md.h index b01e4ce1a1d8..e7a292333ea4 100644 --- a/usr.sbin/sysinst/arch/hppa/md.h +++ b/usr.sbin/sysinst/arch/hppa/md.h @@ -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 */ diff --git a/usr.sbin/sysinst/arch/luna68k/md.h b/usr.sbin/sysinst/arch/luna68k/md.h index 9b86c9f42c18..074bc29b5e38 100644 --- a/usr.sbin/sysinst/arch/luna68k/md.h +++ b/usr.sbin/sysinst/arch/luna68k/md.h @@ -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 */ diff --git a/usr.sbin/sysinst/arch/mipsco/md.h b/usr.sbin/sysinst/arch/mipsco/md.h index 42877eff6389..71df8acfd188 100644 --- a/usr.sbin/sysinst/arch/mipsco/md.h +++ b/usr.sbin/sysinst/arch/mipsco/md.h @@ -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 */ diff --git a/usr.sbin/sysinst/arch/mvme68k/md.h b/usr.sbin/sysinst/arch/mvme68k/md.h index 573c50e41822..8381afd3a757 100644 --- a/usr.sbin/sysinst/arch/mvme68k/md.h +++ b/usr.sbin/sysinst/arch/mvme68k/md.h @@ -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 */ diff --git a/usr.sbin/sysinst/arch/news68k/md.h b/usr.sbin/sysinst/arch/news68k/md.h index ec421208c2e5..0b2227829315 100644 --- a/usr.sbin/sysinst/arch/news68k/md.h +++ b/usr.sbin/sysinst/arch/news68k/md.h @@ -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 */ diff --git a/usr.sbin/sysinst/arch/newsmips/md.h b/usr.sbin/sysinst/arch/newsmips/md.h index a27d4af485a4..15a5fceab6da 100644 --- a/usr.sbin/sysinst/arch/newsmips/md.h +++ b/usr.sbin/sysinst/arch/newsmips/md.h @@ -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 */ diff --git a/usr.sbin/sysinst/arch/ofppc/md.h b/usr.sbin/sysinst/arch/ofppc/md.h index b33928f4d5ca..41e885dc43b3 100644 --- a/usr.sbin/sysinst/arch/ofppc/md.h +++ b/usr.sbin/sysinst/arch/ofppc/md.h @@ -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 */ diff --git a/usr.sbin/sysinst/arch/playstation2/md.h b/usr.sbin/sysinst/arch/playstation2/md.h index 10f746cb9598..da39bbc1d941 100644 --- a/usr.sbin/sysinst/arch/playstation2/md.h +++ b/usr.sbin/sysinst/arch/playstation2/md.h @@ -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)*/ diff --git a/usr.sbin/sysinst/arch/pmax/md.h b/usr.sbin/sysinst/arch/pmax/md.h index 4d611233fcd3..dbae54a5aca7 100644 --- a/usr.sbin/sysinst/arch/pmax/md.h +++ b/usr.sbin/sysinst/arch/pmax/md.h @@ -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 */ diff --git a/usr.sbin/sysinst/arch/prep/md.h b/usr.sbin/sysinst/arch/prep/md.h index cac495ffa6dd..26c1fbd805a6 100644 --- a/usr.sbin/sysinst/arch/prep/md.h +++ b/usr.sbin/sysinst/arch/prep/md.h @@ -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 */ diff --git a/usr.sbin/sysinst/arch/sgimips/md.h b/usr.sbin/sysinst/arch/sgimips/md.h index c2dce5e6da82..a8932b879d8b 100644 --- a/usr.sbin/sysinst/arch/sgimips/md.h +++ b/usr.sbin/sysinst/arch/sgimips/md.h @@ -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 */ diff --git a/usr.sbin/sysinst/arch/sparc/md.h b/usr.sbin/sysinst/arch/sparc/md.h index 0410adf9fb88..b34162ffd417 100644 --- a/usr.sbin/sysinst/arch/sparc/md.h +++ b/usr.sbin/sysinst/arch/sparc/md.h @@ -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 */ diff --git a/usr.sbin/sysinst/arch/sparc64/md.h b/usr.sbin/sysinst/arch/sparc64/md.h index 31a6fe8378a5..81a53252231e 100644 --- a/usr.sbin/sysinst/arch/sparc64/md.h +++ b/usr.sbin/sysinst/arch/sparc64/md.h @@ -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 */ diff --git a/usr.sbin/sysinst/arch/vax/md.h b/usr.sbin/sysinst/arch/vax/md.h index cbd6f84a1e82..5a6ec1ffc846 100644 --- a/usr.sbin/sysinst/arch/vax/md.h +++ b/usr.sbin/sysinst/arch/vax/md.h @@ -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 */ diff --git a/usr.sbin/sysinst/arch/x68k/md.h b/usr.sbin/sysinst/arch/x68k/md.h index 61c8ecaedc8b..9b18cf8c91fc 100644 --- a/usr.sbin/sysinst/arch/x68k/md.h +++ b/usr.sbin/sysinst/arch/x68k/md.h @@ -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 */