Module Name: src
Committed By: martin
Date: Sun Nov 18 10:34:46 UTC 2018
Modified Files:
src/usr.sbin/sysinst/arch/acorn32: md.h
src/usr.sbin/sysinst/arch/amd64: md.h
src/usr.sbin/sysinst/arch/amiga: md.h
src/usr.sbin/sysinst/arch/bebox: md.h
src/usr.sbin/sysinst/arch/cats: md.h
src/usr.sbin/sysinst/arch/evbppc: md.h
src/usr.sbin/sysinst/arch/hpcarm: md.h
src/usr.sbin/sysinst/arch/hpcmips: md.h
src/usr.sbin/sysinst/arch/mac68k: md.h
src/usr.sbin/sysinst/arch/macppc: md.h
src/usr.sbin/sysinst/arch/sandpoint: md.h
src/usr.sbin/sysinst/arch/shark: md.h
src/usr.sbin/sysinst/arch/zaurus: md.h
Log Message:
More size estimate fixes
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/acorn32/md.h
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/amd64/md.h
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/amiga/md.h
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/bebox/md.h
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/cats/md.h
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/evbppc/md.h
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/hpcarm/md.h
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/hpcmips/md.h
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/mac68k/md.h
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/macppc/md.h
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/sandpoint/md.h
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/shark/md.h
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/zaurus/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/acorn32/md.h
diff -u src/usr.sbin/sysinst/arch/acorn32/md.h:1.1 src/usr.sbin/sysinst/arch/acorn32/md.h:1.2
--- src/usr.sbin/sysinst/arch/acorn32/md.h:1.1 Sat Jul 26 19:30:44 2014
+++ src/usr.sbin/sysinst/arch/acorn32/md.h Sun Nov 18 10:34:45 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/18 10:34:45 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -37,8 +37,10 @@
/* Constants and defines */
-/* Megs required for a full X installation. */
-#define XNEEDMB 60
+#define DEFUSRSIZE 1024 /* Default /usr size, if /home */
+#define XNEEDMB 256 /* Extra megs for full X installation */
+#define DEBNEEDMB 980 /* Extra megs for debug sets */
+
#define PART_REST PART_D
#define PART_USR PART_E
Index: src/usr.sbin/sysinst/arch/amd64/md.h
diff -u src/usr.sbin/sysinst/arch/amd64/md.h:1.3 src/usr.sbin/sysinst/arch/amd64/md.h:1.4
--- src/usr.sbin/sysinst/arch/amd64/md.h:1.3 Mon Nov 5 19:45:56 2018
+++ src/usr.sbin/sysinst/arch/amd64/md.h Sun Nov 18 10:34:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.3 2018/11/05 19:45:56 martin Exp $ */
+/* $NetBSD: md.h,v 1.4 2018/11/18 10:34:45 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -46,11 +46,12 @@
#include "mbr.h"
/* constants and defines */
-#define DEFUSRSIZE 0
-#define DEFSWAPSIZE (-1)
+#define DEFROOTSIZE 128 /* Default root size */
+#define DEFUSRSIZE 0 /* Default /usr size, if /home */
+#define XNEEDMB 300 /* Extra megs for full X installation */
+#define DEBNEEDMB 1400 /* Extra megs for debug sets */
-/* Megs required for a full X installation. */
-#define XNEEDMB 50
+#define DEFSWAPSIZE (-1)
/* use UFS2 by default for ffs */
#define DEFAULT_UFS2
Index: src/usr.sbin/sysinst/arch/amiga/md.h
diff -u src/usr.sbin/sysinst/arch/amiga/md.h:1.2 src/usr.sbin/sysinst/arch/amiga/md.h:1.3
--- src/usr.sbin/sysinst/arch/amiga/md.h:1.2 Mon Nov 5 19:45:56 2018
+++ src/usr.sbin/sysinst/arch/amiga/md.h Sun Nov 18 10:34:45 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/18 10:34:45 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -45,7 +45,7 @@
/* Megs required for a full X installation. */
-#define XNEEDMB 50
+#define XNEEDMB 225
/*
Index: src/usr.sbin/sysinst/arch/bebox/md.h
diff -u src/usr.sbin/sysinst/arch/bebox/md.h:1.1 src/usr.sbin/sysinst/arch/bebox/md.h:1.2
--- src/usr.sbin/sysinst/arch/bebox/md.h:1.1 Sat Jul 26 19:30:44 2014
+++ src/usr.sbin/sysinst/arch/bebox/md.h Sun Nov 18 10:34:45 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/18 10:34:45 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -41,8 +41,9 @@
/* constants and defines */
-/* Megs required for a full X installation. */
-#define XNEEDMB 50
+#define XNEEDMB 256 /* Extra megs for full X installation */
+#define DEBNEEDMB 900 /* Extra megs for debug sets */
+
/*
Index: src/usr.sbin/sysinst/arch/cats/md.h
diff -u src/usr.sbin/sysinst/arch/cats/md.h:1.1 src/usr.sbin/sysinst/arch/cats/md.h:1.2
--- src/usr.sbin/sysinst/arch/cats/md.h:1.1 Sat Jul 26 19:30:44 2014
+++ src/usr.sbin/sysinst/arch/cats/md.h Sun Nov 18 10:34:45 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/18 10:34:45 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -37,8 +37,10 @@
/* Constants and defines */
-/* Megs required for a full X installation. */
-#define XNEEDMB 60
+#define DEFROOTSIZE 80 /* Default root size */
+#define XNEEDMB 225 /* Extra megs for full X installation */
+#define DEBNEEDMB 980 /* Extra megs for debug sets */
+
/*
* Default filesets to fetch and install during installation
Index: src/usr.sbin/sysinst/arch/evbppc/md.h
diff -u src/usr.sbin/sysinst/arch/evbppc/md.h:1.1 src/usr.sbin/sysinst/arch/evbppc/md.h:1.2
--- src/usr.sbin/sysinst/arch/evbppc/md.h:1.1 Sat Jul 26 19:30:45 2014
+++ src/usr.sbin/sysinst/arch/evbppc/md.h Sun Nov 18 10:34:46 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/18 10:34:46 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -41,8 +41,10 @@
/* constants and defines */
-/* Megs required for a full X installation. */
-#define XNEEDMB 50
+#define DEFROOTSIZE 80 /* Default root size */
+#define XNEEDMB 256 /* Extra megs for full X installation */
+#define DEBNEEDMB 880 /* Extra megs for debug sets */
+
/*
Index: src/usr.sbin/sysinst/arch/hpcarm/md.h
diff -u src/usr.sbin/sysinst/arch/hpcarm/md.h:1.1 src/usr.sbin/sysinst/arch/hpcarm/md.h:1.2
--- src/usr.sbin/sysinst/arch/hpcarm/md.h:1.1 Sat Jul 26 19:30:45 2014
+++ src/usr.sbin/sysinst/arch/hpcarm/md.h Sun Nov 18 10:34:46 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/18 10:34:46 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -46,8 +46,17 @@
/* constants and defines */
+/* Megs for the / partition, if separate */
+#define DEFROOTSIZE 64
-#define XNEEDMB 39 /* Extra megs for full X installation */
+/* Megs for the /usr partition, if separate */
+#define DEFUSRSIZE 960
+
+/* Megs required for a full X installation. */
+#define XNEEDMB 225
+
+/* Megs required for debug sets */
+#define DEBNEEDMB 980
/*
Index: src/usr.sbin/sysinst/arch/hpcmips/md.h
diff -u src/usr.sbin/sysinst/arch/hpcmips/md.h:1.1 src/usr.sbin/sysinst/arch/hpcmips/md.h:1.2
--- src/usr.sbin/sysinst/arch/hpcmips/md.h:1.1 Sat Jul 26 19:30:45 2014
+++ src/usr.sbin/sysinst/arch/hpcmips/md.h Sun Nov 18 10:34:46 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/18 10:34:46 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -47,7 +47,14 @@
/* constants and defines */
-#define XNEEDMB 39 /* Extra megs for full X installation */
+/* Megs for the / partition, if separate */
+#define DEFROOTSIZE 48
+
+/* Megs required for a full X installation. */
+#define XNEEDMB 256
+
+/* Megs required for debug sets */
+#define DEBNEEDMB 880
/*
Index: src/usr.sbin/sysinst/arch/mac68k/md.h
diff -u src/usr.sbin/sysinst/arch/mac68k/md.h:1.1 src/usr.sbin/sysinst/arch/mac68k/md.h:1.2
--- src/usr.sbin/sysinst/arch/mac68k/md.h:1.1 Sat Jul 26 19:30:46 2014
+++ src/usr.sbin/sysinst/arch/mac68k/md.h Sun Nov 18 10:34:46 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/18 10:34:46 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -156,8 +156,12 @@ typedef struct {
*/
extern struct apple_part_map_entry new_map[];
+
+/* Megs for the / partition, if separate */
+#define DEFROOTSIZE 60
+
/* Megs required for a full X installation. */
-#define XNEEDMB 50
+#define XNEEDMB 225
/*
* Machine-specific command to write a new label to a disk.
Index: src/usr.sbin/sysinst/arch/macppc/md.h
diff -u src/usr.sbin/sysinst/arch/macppc/md.h:1.1 src/usr.sbin/sysinst/arch/macppc/md.h:1.2
--- src/usr.sbin/sysinst/arch/macppc/md.h:1.1 Sat Jul 26 19:30:46 2014
+++ src/usr.sbin/sysinst/arch/macppc/md.h Sun Nov 18 10:34:46 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/18 10:34:46 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -44,8 +44,15 @@
#define PART_RAW PART_C
#define PART_USR PART_G
+
+/* Megs for the / partition, if separate */
+#define DEFROOTSIZE 60
+
/* Megs required for a full X installation. */
-#define XNEEDMB 35 /* XXXTHORPEJ */
+#define XNEEDMB 256
+
+/* Megs required for debug sets */
+#define DEBNEEDMB 900
/* have support for booting from UFS2 */
#define HAVE_UFS2_BOOT
Index: src/usr.sbin/sysinst/arch/sandpoint/md.h
diff -u src/usr.sbin/sysinst/arch/sandpoint/md.h:1.1 src/usr.sbin/sysinst/arch/sandpoint/md.h:1.2
--- src/usr.sbin/sysinst/arch/sandpoint/md.h:1.1 Sat Jul 26 19:30:47 2014
+++ src/usr.sbin/sysinst/arch/sandpoint/md.h Sun Nov 18 10:34:46 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/18 10:34:46 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -41,8 +41,14 @@
/* constants and defines */
+/* Megs for the / partition, if separate */
+#define DEFROOTSIZE 60
+
/* Megs required for a full X installation. */
-#define XNEEDMB 50
+#define XNEEDMB 225
+
+/* Megs required for debug sets */
+#define DEBNEEDMB 900
/*
Index: src/usr.sbin/sysinst/arch/shark/md.h
diff -u src/usr.sbin/sysinst/arch/shark/md.h:1.1 src/usr.sbin/sysinst/arch/shark/md.h:1.2
--- src/usr.sbin/sysinst/arch/shark/md.h:1.1 Sat Jul 26 19:30:47 2014
+++ src/usr.sbin/sysinst/arch/shark/md.h Sun Nov 18 10:34:46 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/18 10:34:46 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -36,9 +36,14 @@
/* md.h -- Machine specific definitions for the shark */
/* Constants and defines */
+/* Megs for the /usr partition, if separate */
+#define DEFUSRSIZE 980
/* Megs required for a full X installation. */
-#define XNEEDMB 60
+#define XNEEDMB 225
+
+/* Megs required for debug sets */
+#define DEBNEEDMB 980
/*
* Default filesets to fetch and install during installation
Index: src/usr.sbin/sysinst/arch/zaurus/md.h
diff -u src/usr.sbin/sysinst/arch/zaurus/md.h:1.1 src/usr.sbin/sysinst/arch/zaurus/md.h:1.2
--- src/usr.sbin/sysinst/arch/zaurus/md.h:1.1 Sat Jul 26 19:30:47 2014
+++ src/usr.sbin/sysinst/arch/zaurus/md.h Sun Nov 18 10:34:46 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/18 10:34:46 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -45,8 +45,14 @@
#define PART_USR PART_E /* Can be after PART_FIRST_FREE */
#define PART_FIRST_FREE PART_F
+/* Megs for the /usr partition, if separate */
+#define DEFUSRSIZE 980
+
/* Megs required for a full X installation. */
-#define XNEEDMB 60
+#define XNEEDMB 225
+
+/* Megs required for debug sets */
+#define DEBNEEDMB 980
/* have support for booting from UFS2 */
#define HAVE_UFS2_BOOT
