[src/trunk]: src/usr.sbin/sysinst PR install/56303: when using xz files enabl...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a8e2e61f6528
branches:  trunk
changeset: 1022338:a8e2e61f6528
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Jul 13 09:13:00 2021 +0000

description:
PR install/56303: when using xz files enable swap during set extraction
if the machine does not have more than 256MB of RAM.

diffstat:

 usr.sbin/sysinst/Makefile.inc |  6 +++++-
 usr.sbin/sysinst/defs.h       |  7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diffs (42 lines):

diff -r 09a70dd63433 -r a8e2e61f6528 usr.sbin/sysinst/Makefile.inc
--- a/usr.sbin/sysinst/Makefile.inc     Tue Jul 13 09:00:26 2021 +0000
+++ b/usr.sbin/sysinst/Makefile.inc     Tue Jul 13 09:13:00 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.40 2021/04/13 07:53:19 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.41 2021/07/13 09:13:00 martin Exp $
 #
 # Makefile for sysinst
 
@@ -94,6 +94,10 @@
                ${NODISKLABEL:D-DNO_DISKLABEL} \
                ${NOPARTMAN:D-DNO_PARTMAN}
 
+.if ${USE_XZ_SETS:Uno} != "no"
+CPPFLAGS+=     -DEXTRACT_NEEDS_BIG_RAM
+.endif
+
 .if ${RELEASEMACHINEDIR} != ${MACHINE}
 CPPFLAGS+=     -DARCH_SUBDIR="\"${RELEASEMACHINEDIR}\""
 CPPFLAGS+=     -DPKG_ARCH_SUBDIR="\"${MACHINE_ARCH}\""
diff -r 09a70dd63433 -r a8e2e61f6528 usr.sbin/sysinst/defs.h
--- a/usr.sbin/sysinst/defs.h   Tue Jul 13 09:00:26 2021 +0000
+++ b/usr.sbin/sysinst/defs.h   Tue Jul 13 09:13:00 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: defs.h,v 1.70 2021/01/31 22:45:46 rillig Exp $ */
+/*     $NetBSD: defs.h,v 1.71 2021/07/13 09:13:00 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -68,7 +68,12 @@
  * if a system does not have more ram (in MB) than this, swap will be enabled
  * very early (as soon as the swap partition has been created)
  */
+#ifdef EXTRACT_NEEDS_BIG_RAM   /* we use an expensive decompressor */
+#define        TINY_RAM_SIZE           256
+#else
 #define        TINY_RAM_SIZE           32
+#endif
+
 /*
  * if a system has less ram (in MB) than this, we will not create a
  * tmpfs /tmp by default (to workaround PR misc/54886)