[src/trunk]: src/usr.sbin/sysinst/arch Define DEFSWAPSIZE properly. DEFSWAPRA...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/usr.sbin/sysinst/arch Define DEFSWAPSIZE properly. DEFSWAPRA...
From: tsutsui <tsutsui%NetBSD.org@localhost>
Date: Thu, 16 Jun 2022 16:03:53 +0000
details:   https://anonhg.NetBSD.org/src/rev/8c3f713e8732
branches:  trunk
changeset: 366803:8c3f713e8732
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Thu Jun 16 14:03:37 2022 +0000

description:
Define DEFSWAPSIZE properly. DEFSWAPRAM seems obsolete.

diffstat:

 usr.sbin/sysinst/arch/arc/md.h          |  5 ++---
 usr.sbin/sysinst/arch/atari/md.h        |  4 ++--
 usr.sbin/sysinst/arch/cobalt/md.h       |  5 ++---
 usr.sbin/sysinst/arch/emips/md.h        |  4 ++--
 usr.sbin/sysinst/arch/hp300/md.h        |  4 ++--
 usr.sbin/sysinst/arch/hppa/md.h         |  4 ++--
 usr.sbin/sysinst/arch/luna68k/md.h      |  4 ++--
 usr.sbin/sysinst/arch/mipsco/md.h       |  4 ++--
 usr.sbin/sysinst/arch/mvme68k/md.h      |  4 ++--
 usr.sbin/sysinst/arch/news68k/md.h      |  4 ++--
 usr.sbin/sysinst/arch/newsmips/md.h     |  4 ++--
 usr.sbin/sysinst/arch/ofppc/md.h        |  5 ++---
 usr.sbin/sysinst/arch/playstation2/md.h |  4 ++--
 usr.sbin/sysinst/arch/pmax/md.h         |  4 ++--
 usr.sbin/sysinst/arch/prep/md.h         |  4 ++--
 usr.sbin/sysinst/arch/sgimips/md.h      |  4 ++--
 usr.sbin/sysinst/arch/sparc/md.h        |  4 ++--
 usr.sbin/sysinst/arch/sparc64/md.h      |  4 ++--
 usr.sbin/sysinst/arch/vax/md.h          |  4 ++--
 usr.sbin/sysinst/arch/x68k/md.h         |  4 ++--
 20 files changed, 40 insertions(+), 43 deletions(-)

diffs (truncated from 383 to 300 lines):

diff -r ce3d04be3887 -r 8c3f713e8732 usr.sbin/sysinst/arch/arc/md.h
--- a/usr.sbin/sysinst/arch/arc/md.h    Thu Jun 16 08:21:57 2022 +0000
+++ b/usr.sbin/sysinst/arch/arc/md.h    Thu Jun 16 14:03:37 2022 +0000
@@ -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 -r ce3d04be3887 -r 8c3f713e8732 usr.sbin/sysinst/arch/atari/md.h
--- a/usr.sbin/sysinst/arch/atari/md.h  Thu Jun 16 08:21:57 2022 +0000
+++ b/usr.sbin/sysinst/arch/atari/md.h  Thu Jun 16 14:03:37 2022 +0000
@@ -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 -r ce3d04be3887 -r 8c3f713e8732 usr.sbin/sysinst/arch/cobalt/md.h
--- a/usr.sbin/sysinst/arch/cobalt/md.h Thu Jun 16 08:21:57 2022 +0000
+++ b/usr.sbin/sysinst/arch/cobalt/md.h Thu Jun 16 14:03:37 2022 +0000
@@ -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 -r ce3d04be3887 -r 8c3f713e8732 usr.sbin/sysinst/arch/emips/md.h
--- a/usr.sbin/sysinst/arch/emips/md.h  Thu Jun 16 08:21:57 2022 +0000
+++ b/usr.sbin/sysinst/arch/emips/md.h  Thu Jun 16 14:03:37 2022 +0000
@@ -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 -r ce3d04be3887 -r 8c3f713e8732 usr.sbin/sysinst/arch/hp300/md.h
--- a/usr.sbin/sysinst/arch/hp300/md.h  Thu Jun 16 08:21:57 2022 +0000
+++ b/usr.sbin/sysinst/arch/hp300/md.h  Thu Jun 16 14:03:37 2022 +0000
@@ -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 -r ce3d04be3887 -r 8c3f713e8732 usr.sbin/sysinst/arch/hppa/md.h
--- a/usr.sbin/sysinst/arch/hppa/md.h   Thu Jun 16 08:21:57 2022 +0000
+++ b/usr.sbin/sysinst/arch/hppa/md.h   Thu Jun 16 14:03:37 2022 +0000
@@ -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 -r ce3d04be3887 -r 8c3f713e8732 usr.sbin/sysinst/arch/luna68k/md.h
--- a/usr.sbin/sysinst/arch/luna68k/md.h        Thu Jun 16 08:21:57 2022 +0000
+++ b/usr.sbin/sysinst/arch/luna68k/md.h        Thu Jun 16 14:03:37 2022 +0000
@@ -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 -r ce3d04be3887 -r 8c3f713e8732 usr.sbin/sysinst/arch/mipsco/md.h
--- a/usr.sbin/sysinst/arch/mipsco/md.h Thu Jun 16 08:21:57 2022 +0000
+++ b/usr.sbin/sysinst/arch/mipsco/md.h Thu Jun 16 14:03:37 2022 +0000
@@ -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 -r ce3d04be3887 -r 8c3f713e8732 usr.sbin/sysinst/arch/mvme68k/md.h
--- a/usr.sbin/sysinst/arch/mvme68k/md.h        Thu Jun 16 08:21:57 2022 +0000
+++ b/usr.sbin/sysinst/arch/mvme68k/md.h        Thu Jun 16 14:03:37 2022 +0000
@@ -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 -r ce3d04be3887 -r 8c3f713e8732 usr.sbin/sysinst/arch/news68k/md.h
--- a/usr.sbin/sysinst/arch/news68k/md.h        Thu Jun 16 08:21:57 2022 +0000
+++ b/usr.sbin/sysinst/arch/news68k/md.h        Thu Jun 16 14:03:37 2022 +0000
@@ -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 -r ce3d04be3887 -r 8c3f713e8732 usr.sbin/sysinst/arch/newsmips/md.h
--- a/usr.sbin/sysinst/arch/newsmips/md.h       Thu Jun 16 08:21:57 2022 +0000
+++ b/usr.sbin/sysinst/arch/newsmips/md.h       Thu Jun 16 14:03:37 2022 +0000
@@ -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 -r ce3d04be3887 -r 8c3f713e8732 usr.sbin/sysinst/arch/ofppc/md.h
--- a/usr.sbin/sysinst/arch/ofppc/md.h  Thu Jun 16 08:21:57 2022 +0000
+++ b/usr.sbin/sysinst/arch/ofppc/md.h  Thu Jun 16 14:03:37 2022 +0000
@@ -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 -r ce3d04be3887 -r 8c3f713e8732 usr.sbin/sysinst/arch/playstation2/md.h
--- a/usr.sbin/sysinst/arch/playstation2/md.h   Thu Jun 16 08:21:57 2022 +0000
+++ b/usr.sbin/sysinst/arch/playstation2/md.h   Thu Jun 16 14:03:37 2022 +0000
@@ -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 -r ce3d04be3887 -r 8c3f713e8732 usr.sbin/sysinst/arch/pmax/md.h
--- a/usr.sbin/sysinst/arch/pmax/md.h   Thu Jun 16 08:21:57 2022 +0000
+++ b/usr.sbin/sysinst/arch/pmax/md.h   Thu Jun 16 14:03:37 2022 +0000
@@ -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 -r ce3d04be3887 -r 8c3f713e8732 usr.sbin/sysinst/arch/prep/md.h
--- a/usr.sbin/sysinst/arch/prep/md.h   Thu Jun 16 08:21:57 2022 +0000
+++ b/usr.sbin/sysinst/arch/prep/md.h   Thu Jun 16 14:03:37 2022 +0000
@@ -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 -r ce3d04be3887 -r 8c3f713e8732 usr.sbin/sysinst/arch/sgimips/md.h
--- a/usr.sbin/sysinst/arch/sgimips/md.h        Thu Jun 16 08:21:57 2022 +0000
+++ b/usr.sbin/sysinst/arch/sgimips/md.h        Thu Jun 16 14:03:37 2022 +0000
@@ -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 */
Prev by Date: [src/trunk]: src/common/lib/libc/arch/aarch64/atomic remove stray 'w'
Next by Date: [src/netbsd-9]: src/sys/lib/libkern/arch/hppa Pull up following revision(s) (...
Previous by Thread: [src/trunk]: src/common/lib/libc/arch/aarch64/atomic remove stray 'w'
Next by Thread: [src/netbsd-9]: src/sys/lib/libkern/arch/hppa Pull up following revision(s) (...
Indexes:
Home | Main Index | Thread Index | Old Index