Wed Nov 4 14:29:40 2020 UTC ()
Add (experimental) entropy input support:
Early during new installs or after upgrades we check if entropy is
available. If not (no hardware random number generator available)
we inform the user and ask them to fix it.


(martin)
diff -r1.36 -r1.37 src/usr.sbin/sysinst/Makefile.inc
diff -r1.68 -r1.69 src/usr.sbin/sysinst/defs.h
diff -r1.19 -r1.20 src/usr.sbin/sysinst/install.c
diff -r0 -r1.1 src/usr.sbin/sysinst/menus.entropy
diff -r0 -r1.1 src/usr.sbin/sysinst/msg.entropy.de
diff -r0 -r1.1 src/usr.sbin/sysinst/msg.entropy.en
diff -r0 -r1.1 src/usr.sbin/sysinst/msg.entropy.es
diff -r0 -r1.1 src/usr.sbin/sysinst/msg.entropy.fr
diff -r0 -r1.1 src/usr.sbin/sysinst/msg.entropy.pl
diff -r1.23 -r1.24 src/usr.sbin/sysinst/menus.mi
diff -r1.26 -r1.27 src/usr.sbin/sysinst/msg.mi.de
diff -r1.34 -r1.35 src/usr.sbin/sysinst/msg.mi.en
diff -r1.34 -r1.35 src/usr.sbin/sysinst/msg.mi.pl
diff -r1.28 -r1.29 src/usr.sbin/sysinst/msg.mi.es
diff -r1.33 -r1.34 src/usr.sbin/sysinst/msg.mi.fr
diff -r1.2 -r1.3 src/usr.sbin/sysinst/msg.pm.de
diff -r1.2 -r1.3 src/usr.sbin/sysinst/msg.pm.en
diff -r1.2 -r1.3 src/usr.sbin/sysinst/msg.pm.es
diff -r1.2 -r1.3 src/usr.sbin/sysinst/msg.pm.fr
diff -r1.2 -r1.3 src/usr.sbin/sysinst/msg.pm.pl
diff -r1.16 -r1.17 src/usr.sbin/sysinst/upgrade.c
diff -r1.53 -r1.54 src/usr.sbin/sysinst/util.c
diff -r1.4 -r1.5 src/usr.sbin/sysinst/arch/atari/Makefile
diff -r1.3 -r1.4 src/usr.sbin/sysinst/arch/ews4800mips/Makefile

cvs diff -r1.36 -r1.37 src/usr.sbin/sysinst/Makefile.inc (expand / switch to unified diff)

--- src/usr.sbin/sysinst/Makefile.inc 2020/10/30 18:47:38 1.36
+++ src/usr.sbin/sysinst/Makefile.inc 2020/11/04 14:29:40 1.37
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.inc,v 1.36 2020/10/30 18:47:38 martin Exp $ 1# $NetBSD: Makefile.inc,v 1.37 2020/11/04 14:29:40 martin Exp $
2# 2#
3# Makefile for sysinst 3# Makefile for sysinst
4 4
5.if exists(${.CURDIR}/../../../Makefile.inc) 5.if exists(${.CURDIR}/../../../Makefile.inc)
6.include "${.CURDIR}/../../../Makefile.inc" 6.include "${.CURDIR}/../../../Makefile.inc"
7.endif 7.endif
8 8
9PROG= sysinst 9PROG= sysinst
10MAN= sysinst.8 10MAN= sysinst.8
11 11
12WARNS= 4 12WARNS= 4
13 13
14SRCS+= menu_defs.c msg_defs.c main.c install.c upgrade.c \ 14SRCS+= menu_defs.c msg_defs.c main.c install.c upgrade.c \
@@ -37,26 +37,31 @@ CPPFLAGS+= -DHAVE_GPT @@ -37,26 +37,31 @@ CPPFLAGS+= -DHAVE_GPT
37GPT_DIR=${.CURDIR}/../../../../sbin/gpt 37GPT_DIR=${.CURDIR}/../../../../sbin/gpt
38SRCS+= gpt.c gpt_uuid.c 38SRCS+= gpt.c gpt_uuid.c
39CPPFLAGS.gpt_uuid.c+= -I${GPT_DIR} 39CPPFLAGS.gpt_uuid.c+= -I${GPT_DIR}
40CPPFLAGS.gpt.c+= -I${GPT_DIR} 40CPPFLAGS.gpt.c+= -I${GPT_DIR}
41.endif 41.endif
42.if ${NO_MBR:Uyes} != "yes" 42.if ${NO_MBR:Uyes} != "yes"
43CPPFLAGS+= -DHAVE_MBR 43CPPFLAGS+= -DHAVE_MBR
44SRCS+= mbr.c 44SRCS+= mbr.c
45.endif 45.endif
46.if ${NO_CLONES:Uno} == "yes" 46.if ${NO_CLONES:Uno} == "yes"
47CPPFLAGS+= -DNO_CLONES 47CPPFLAGS+= -DNO_CLONES
48.endif 48.endif
49 49
 50.if ${CHECK_ENTROPY:Uyes} != "no"
 51MENUS_MI+= menus.entropy
 52CPPFLAGS+= -DCHECK_ENTROPY=1
 53.endif
 54
50MSG_MD?= msg.md.${SYSINSTLANG} 55MSG_MD?= msg.md.${SYSINSTLANG}
51MENUS_MD?= menus.md.${SYSINSTLANG} 56MENUS_MD?= menus.md.${SYSINSTLANG}
52 57
53.include <bsd.own.mk> # for mk.conf 58.include <bsd.own.mk> # for mk.conf
54#.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" 59#.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
55 60
56DISTRIBVER!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh 61DISTRIBVER!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
57DISTRIBVERDEP= ${NETBSDSRCDIR}/sys/sys/param.h \ 62DISTRIBVERDEP= ${NETBSDSRCDIR}/sys/sys/param.h \
58 ${NETBSDSRCDIR}/sys/conf/osrelease.sh 63 ${NETBSDSRCDIR}/sys/conf/osrelease.sh
59 64
60_MKSHTARGET_CREATE?= ${_MKSHMSG_CREATE} ${.CURDIR:T}/${.TARGET} 65_MKSHTARGET_CREATE?= ${_MKSHMSG_CREATE} ${.CURDIR:T}/${.TARGET}
61 66
62DPADD= ${LIBCURSES} ${LIBTERMLIB} ${LIBPROP} ${LIBUTIL} 67DPADD= ${LIBCURSES} ${LIBTERMLIB} ${LIBPROP} ${LIBUTIL}
@@ -187,27 +192,31 @@ msg_defs.h: msg_defs.c @@ -187,27 +192,31 @@ msg_defs.h: msg_defs.c
187 } 192 }
188msg_defs.c: msg.def 193msg_defs.c: msg.def
189 ${_MKTARGET_CREATE} 194 ${_MKTARGET_CREATE}
190 [ ! -f msg_defs.h ] || mv -f msg_defs.h msg_defs.oh 195 [ ! -f msg_defs.h ] || mv -f msg_defs.h msg_defs.oh
191 ${TOOL_MSGC} msg.def 196 ${TOOL_MSGC} msg.def
192 ! cmp -s msg_defs.oh msg_defs.h || mv -f msg_defs.oh msg_defs.h 197 ! cmp -s msg_defs.oh msg_defs.h || mv -f msg_defs.oh msg_defs.h
193 @rm -f msg_defs.oh 198 @rm -f msg_defs.oh
194 199
195# Needed to get proper dependency checks on osrelease 200# Needed to get proper dependency checks on osrelease
196msgtouch: ${DISTRIBVERDEP} 201msgtouch: ${DISTRIBVERDEP}
197 touch ${.TARGET} 202 touch ${.TARGET}
198 203
199.if !defined(NOPARTMAN) 204.if !defined(NOPARTMAN)
200MSG_MD+= msg.pm.${SYSINSTLANG}  205MSG_MD+= msg.pm.${SYSINSTLANG}
 206.endif
 207
 208.if ${CHECK_ENTROPY:Uyes} != "no"
 209MSG_MD+= msg.entropy.${SYSINSTLANG}
201.endif 210.endif
202 211
203msg.def: msg.mi.${SYSINSTLANG} ${MSG_MD} msgtouch 212msg.def: msg.mi.${SYSINSTLANG} ${MSG_MD} msgtouch
204 ${_MKTARGET_CREATE} 213 ${_MKTARGET_CREATE}
205 ${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" ${.ALLSRC} | \ 214 ${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" ${.ALLSRC} | \
206 ${TOOL_SED} "s/@@MACHINE@@/${MACHINE}/" | \ 215 ${TOOL_SED} "s/@@MACHINE@@/${MACHINE}/" | \
207 ${TOOL_AWK} -f ${UNIF_AWK} -v defines="${MD_OPTIONS}" > ${.TARGET} 216 ${TOOL_AWK} -f ${UNIF_AWK} -v defines="${MD_OPTIONS}" > ${.TARGET}
208 217
209menus.def: ${MENUS_MI} ${MENUS_MD} msgtouch 218menus.def: ${MENUS_MI} ${MENUS_MD} msgtouch
210 ${_MKTARGET_CREATE} 219 ${_MKTARGET_CREATE}
211 ${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" ${.ALLSRC} | \ 220 ${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" ${.ALLSRC} | \
212 ${TOOL_SED} "s/@@MACHINE@@/${MACHINE}/" | \ 221 ${TOOL_SED} "s/@@MACHINE@@/${MACHINE}/" | \
213 ${TOOL_AWK} -f ${UNIF_AWK} -v defines="${MD_OPTIONS}" > ${.TARGET} 222 ${TOOL_AWK} -f ${UNIF_AWK} -v defines="${MD_OPTIONS}" > ${.TARGET}

cvs diff -r1.68 -r1.69 src/usr.sbin/sysinst/defs.h (expand / switch to unified diff)

--- src/usr.sbin/sysinst/defs.h 2020/10/30 18:47:38 1.68
+++ src/usr.sbin/sysinst/defs.h 2020/11/04 14:29:40 1.69
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: defs.h,v 1.68 2020/10/30 18:47:38 martin Exp $ */ 1/* $NetBSD: defs.h,v 1.69 2020/11/04 14:29:40 martin Exp $ */
2 2
3/* 3/*
4 * Copyright 1997 Piermont Information Systems Inc. 4 * Copyright 1997 Piermont Information Systems Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Written by Philip A. Nelson for Piermont Information Systems Inc. 7 * Written by Philip A. Nelson for Piermont Information Systems Inc.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -31,26 +31,27 @@ @@ -31,26 +31,27 @@
31 * THE POSSIBILITY OF SUCH DAMAGE. 31 * THE POSSIBILITY OF SUCH DAMAGE.
32 * 32 *
33 */ 33 */
34 34
35#ifndef _DEFS_H_ 35#ifndef _DEFS_H_
36#define _DEFS_H_ 36#define _DEFS_H_
37 37
38/* defs.h -- definitions for use in the sysinst program. */ 38/* defs.h -- definitions for use in the sysinst program. */
39 39
40/* System includes needed for this. */ 40/* System includes needed for this. */
41#include <sys/queue.h> 41#include <sys/queue.h>
42#include <sys/types.h> 42#include <sys/types.h>
43#include <sys/disk.h> 43#include <sys/disk.h>
 44#include <limits.h>
44#include <uuid.h> 45#include <uuid.h>
45 46
46const char *getfslabelname(uint, uint); 47const char *getfslabelname(uint, uint);
47 48
48#include "msg_defs.h" 49#include "msg_defs.h"
49#include "menu_defs.h" 50#include "menu_defs.h"
50#include "partitions.h" 51#include "partitions.h"
51 52
52#define min(a,b) ((a) < (b) ? (a) : (b)) 53#define min(a,b) ((a) < (b) ? (a) : (b))
53#define max(a,b) ((a) > (b) ? (a) : (b)) 54#define max(a,b) ((a) > (b) ? (a) : (b))
54 55
55/* constants */ 56/* constants */
56#define MEG (1024UL * 1024UL) 57#define MEG (1024UL * 1024UL)
@@ -594,26 +595,27 @@ struct ftpinfo { @@ -594,26 +595,27 @@ struct ftpinfo {
594 char dir[STRSIZE] ; 595 char dir[STRSIZE] ;
595 char user[SSTRSIZE]; 596 char user[SSTRSIZE];
596 char pass[STRSIZE]; 597 char pass[STRSIZE];
597 char proxy[STRSIZE]; 598 char proxy[STRSIZE];
598 unsigned int xfer; /* XFER_FTP for "ftp" or XFER_HTTP for "http" */ 599 unsigned int xfer; /* XFER_FTP for "ftp" or XFER_HTTP for "http" */
599}; 600};
600 601
601/* use the same struct for sets ftp and to build pkgpath */ 602/* use the same struct for sets ftp and to build pkgpath */
602extern struct ftpinfo ftp, pkg, pkgsrc; 603extern struct ftpinfo ftp, pkg, pkgsrc;
603 604
604extern int (*fetch_fn)(const char *); 605extern int (*fetch_fn)(const char *);
605extern char nfs_host[STRSIZE]; 606extern char nfs_host[STRSIZE];
606extern char nfs_dir[STRSIZE]; 607extern char nfs_dir[STRSIZE];
 608extern char entropy_file[PATH_MAX];
607 609
608extern char cdrom_dev[SSTRSIZE]; /* Typically "cd0a" */ 610extern char cdrom_dev[SSTRSIZE]; /* Typically "cd0a" */
609extern char fd_dev[SSTRSIZE]; /* Typically "/dev/fd0a" */ 611extern char fd_dev[SSTRSIZE]; /* Typically "/dev/fd0a" */
610extern const char *fd_type; /* "msdos", "ffs" or maybe "ados" */ 612extern const char *fd_type; /* "msdos", "ffs" or maybe "ados" */
611 613
612extern char localfs_dev[SSTRSIZE]; 614extern char localfs_dev[SSTRSIZE];
613extern char localfs_fs[SSTRSIZE]; 615extern char localfs_fs[SSTRSIZE];
614extern char localfs_dir[STRSIZE]; 616extern char localfs_dir[STRSIZE];
615 617
616extern char targetroot_mnt[SSTRSIZE]; 618extern char targetroot_mnt[SSTRSIZE];
617 619
618extern int mnt2_mounted; 620extern int mnt2_mounted;
619 621
@@ -878,26 +880,27 @@ int extract_file_to(distinfo *dist, int  @@ -878,26 +880,27 @@ int extract_file_to(distinfo *dist, int
878 const char *extr_pattern, bool do_stats); 880 const char *extr_pattern, bool do_stats);
879void do_coloring (unsigned int, unsigned int); 881void do_coloring (unsigned int, unsigned int);
880int set_menu_select(menudesc *, void *); 882int set_menu_select(menudesc *, void *);
881const char *safectime(time_t *); 883const char *safectime(time_t *);
882bool use_tgz_for_set(const char*); 884bool use_tgz_for_set(const char*);
883const char *set_postfix(const char*); 885const char *set_postfix(const char*);
884bool usage_set_from_parts(struct partition_usage_set*, 886bool usage_set_from_parts(struct partition_usage_set*,
885 struct disk_partitions*); 887 struct disk_partitions*);
886void free_usage_set(struct partition_usage_set*); 888void free_usage_set(struct partition_usage_set*);
887bool install_desc_from_parts(struct install_partition_desc *, 889bool install_desc_from_parts(struct install_partition_desc *,
888 struct disk_partitions*); 890 struct disk_partitions*);
889void free_install_desc(struct install_partition_desc*); 891void free_install_desc(struct install_partition_desc*);
890bool may_swap_if_not_sdmmc(const char*); 892bool may_swap_if_not_sdmmc(const char*);
 893bool do_check_entropy(void);
891 894
892/* from target.c */ 895/* from target.c */
893#if defined(DEBUG) || defined(DEBUG_ROOT) 896#if defined(DEBUG) || defined(DEBUG_ROOT)
894void backtowin(void); 897void backtowin(void);
895#endif 898#endif
896bool is_root_part_mount(const char *); 899bool is_root_part_mount(const char *);
897const char *concat_paths(const char *, const char *); 900const char *concat_paths(const char *, const char *);
898const char *target_expand(const char *); 901const char *target_expand(const char *);
899bool needs_expanding(const char *, size_t); 902bool needs_expanding(const char *, size_t);
900void make_target_dir(const char *); 903void make_target_dir(const char *);
901void append_to_target_file(const char *, const char *); 904void append_to_target_file(const char *, const char *);
902void echo_to_target_file(const char *, const char *); 905void echo_to_target_file(const char *, const char *);
903void trunc_target_file(const char *); 906void trunc_target_file(const char *);

cvs diff -r1.19 -r1.20 src/usr.sbin/sysinst/install.c (expand / switch to unified diff)

--- src/usr.sbin/sysinst/install.c 2020/10/14 13:20:27 1.19
+++ src/usr.sbin/sysinst/install.c 2020/11/04 14:29:40 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: install.c,v 1.19 2020/10/14 13:20:27 martin Exp $ */ 1/* $NetBSD: install.c,v 1.20 2020/11/04 14:29:40 martin Exp $ */
2 2
3/* 3/*
4 * Copyright 1997 Piermont Information Systems Inc. 4 * Copyright 1997 Piermont Information Systems Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Written by Philip A. Nelson for Piermont Information Systems Inc. 7 * Written by Philip A. Nelson for Piermont Information Systems Inc.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -158,26 +158,33 @@ do_install(void) @@ -158,26 +158,33 @@ do_install(void)
158 158
159#ifndef NO_PARTMAN 159#ifndef NO_PARTMAN
160 partman_go = -1; 160 partman_go = -1;
161#else 161#else
162 partman_go = 0; 162 partman_go = 0;
163#endif 163#endif
164 164
165#ifndef DEBUG 165#ifndef DEBUG
166 msg_display(MSG_installusure); 166 msg_display(MSG_installusure);
167 if (!ask_noyes(NULL)) 167 if (!ask_noyes(NULL))
168 return; 168 return;
169#endif 169#endif
170 170
 171#ifdef CHECK_ENTROPY
 172 if (!do_check_entropy()) {
 173 hit_enter_to_continue(MSG_abort_installation, NULL);
 174 return;
 175 }
 176#endif
 177
171 memset(&install, 0, sizeof install); 178 memset(&install, 0, sizeof install);
172 179
173 /* Create and mount partitions */ 180 /* Create and mount partitions */
174 find_disks_ret = find_disks(msg_string(MSG_install), false); 181 find_disks_ret = find_disks(msg_string(MSG_install), false);
175 if (partman_go == 1) { 182 if (partman_go == 1) {
176 if (partman() < 0) { 183 if (partman() < 0) {
177 hit_enter_to_continue(MSG_abort_part, NULL); 184 hit_enter_to_continue(MSG_abort_part, NULL);
178 return; 185 return;
179 } 186 }
180 } else if (find_disks_ret < 0) 187 } else if (find_disks_ret < 0)
181 return; 188 return;
182 else { 189 else {
183 /* Classical partitioning wizard */ 190 /* Classical partitioning wizard */

File Added: src/usr.sbin/sysinst/menus.entropy
/*	$NetBSD: menus.entropy,v 1.1 2020/11/04 14:29:40 martin Exp $	*/

/*-
 * Copyright (c) 2003 The NetBSD Foundation, Inc.
 * All rights reserved.
 *
 * This code is derived from software contributed to The NetBSD Foundation
 * by David Laight.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 */

/* Menu system definitions -- entropy setup */

/* arg is an int*, returning a magic value for the selected menu option */
menu not_enough_entropy, title MSG_not_enough_entropy, y=-1, no box, clear,
    exit, exitstring MSG_abort_installation;
	option MSG_entropy_add_manually, exit,
	    action { *((int*)arg) = 1; };
	option MSG_entropy_download_seed, exit,
	    action { *((int*)arg) = 2; };
	option MSG_entropy_download_raw, exit,
	    action { *((int*)arg) = 3; };
	option MSG_entropy_retry, exit,
	    action { *((int*)arg) = 4; };


/* arg is an int*, returning a magic value for the selected menu option */
menu entropy_select_file, title MSG_entropy_select_file, y=-5, box,
    exit, exitstring MSG_cancel;
	option MSG_entropy_add_download_http, exit,
	    action { *((int*)arg) = 1; };
	option MSG_entropy_add_download_ftp, exit,
	    action { *((int*)arg) = 2; };
	option MSG_entropy_add_nfs, exit,
	    action { *((int*)arg) = 3; };
	option MSG_entropy_add_local, exit,
	    action { *((int*)arg) = 4; };


/* arg is an int*, set to SET_RETRY when the menu is aborted */
menu entropy_nfssource, y=-5, x=0, w=70, no box, no clear,
	    exitstring MSG_load_entropy;
	option {src_legend(menu, MSG_Host, nfs_host);},
		action { src_prompt(MSG_Host, nfs_host, sizeof nfs_host); };
	option {src_legend(menu, MSG_Base_dir, nfs_dir);},
		action { src_prompt(MSG_Base_dir, nfs_dir, sizeof nfs_dir); };
	option {src_legend(menu, MSG_entropy_file, entropy_file);},
		action { src_prompt(MSG_set_entropy_file, entropy_file, sizeof entropy_file); };
	option MSG_cancel, exit,
		action { *((int*)arg) = SET_RETRY; };


/* arg is an arg_rv*, pointing to a struct ftpinfo and a return value */
menu entropy_ftpsource, y=-4, x=0, w=70, no box, no clear,
	exitstring MSG_download_entropy;
	option {src_legend(menu, MSG_Host,
			((struct ftpinfo*)((arg_rv*)arg)->arg)->xfer_host[
			((struct ftpinfo*)((arg_rv*)arg)->arg)->xfer]);},
		action { struct ftpinfo *fpi = (struct ftpinfo*)((arg_rv*)arg)->arg;
			src_prompt(MSG_Host, fpi->xfer_host[fpi->xfer],
			sizeof fpi->xfer_host[fpi->xfer]); };
	option {src_legend(menu, MSG_entropy_path_and_file, entropy_file);},
		action { src_prompt(MSG_entropy_path_and_file,
			entropy_file, sizeof entropy_file); };
	option {src_legend(menu, MSG_User,
			((struct ftpinfo*)((arg_rv*)arg)->arg)->user);},
		action { struct ftpinfo *fpi = (struct ftpinfo*)((arg_rv*)arg)->arg;
			src_prompt(MSG_User, fpi->user, sizeof fpi->user);
			fpi->pass[0] = 0;
		};
	option {src_legend(menu, MSG_Password,
		    strcmp(((struct ftpinfo*)((arg_rv*)arg)->arg)->user,
		        "ftp") == 0 ||
			((struct ftpinfo*)((arg_rv*)arg)->arg)->pass[0] == 0
			? ((struct ftpinfo*)((arg_rv*)arg)->arg)->pass
			: msg_string(MSG_hidden));},
		action { struct ftpinfo *fpi = (struct ftpinfo*)((arg_rv*)arg)->arg;
			if (strcmp(fpi->user, "ftp") == 0)
			src_prompt(MSG_email, fpi->pass, sizeof fpi->pass);
		  else {
			msg_prompt_noecho(MSG_Password, "",
					fpi->pass, sizeof fpi->pass);
		  }
		};
	option {src_legend(menu, MSG_Proxy,
		    ((struct ftpinfo*)((arg_rv*)arg)->arg)->proxy);},
		action { struct ftpinfo *fpi = (struct ftpinfo*)((arg_rv*)arg)->arg;
			src_prompt(MSG_Proxy, fpi->proxy, sizeof fpi->proxy);
			if (strcmp(fpi->proxy, "") == 0) {
				unsetenv("ftp_proxy");
				unsetenv("http_proxy");
			} else {
				setenv("ftp_proxy", fpi->proxy, 1);
				setenv("http_proxy", fpi->proxy, 1);
			}
		};
	option MSG_cancel, exit, action { ((arg_rv*)arg)->rv = SET_RETRY; };


/* arg is an int*, set to SET_RETRY when the menu is aborted */
menu entropy_localfs, y=-4, x=0, w=70, no box, no clear,
		 exitstring MSG_load_entropy;
	display action { msg_display(MSG_entropy_localfs); };
	option {src_legend(menu, MSG_Device, localfs_dev);},
		action { src_prompt(MSG_dev, localfs_dev, sizeof localfs_dev);};
	option {src_legend(menu, MSG_File_system, localfs_fs);},
		action { src_prompt(MSG_filesys, localfs_fs, sizeof localfs_fs); };
	option {src_legend(menu, MSG_entropy_path_and_file, entropy_file);},
		action { src_prompt(MSG_entropy_path_and_file, entropy_file, sizeof entropy_file);};
	option MSG_cancel, exit, action { *((int*)arg) = SET_RETRY; };


File Added: src/usr.sbin/sysinst/msg.entropy.de
/*      $NetBSD: msg.entropy.de,v 1.1 2020/11/04 14:29:40 martin Exp $  */

/*
 * Copyright 2018 The NetBSD Foundation, Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED. IN NO EVENT SHALL PIERMONT INFORMATION SYSTEMS INC. BE
 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 *
 */

message not_enough_entropy
{Dieses System scheint nicht über einen Pseudo-Zufallszahlengenerator
zu verfügen. Für das Erzeugen von kryptografisch sicheren Schlüsseldateien
(z.B. ssh host keys) ist nicht genug Entropie verfügbar. 
 
Am einfachsten generieren Sie Zufallsdaten auf einem anderen Computer
und laden sie in dieser Installation. Alternativ können Sie auch
manuell Zufallsdaten eingeben. 
 
Falls Sie einen USB Zufallsgenerator besitzen, verbinden Sie diesen
jetzt und wählen dann die Option "Erneut testen".}

message entropy_add_manually		{Manuelle Zufallseingabe}
message entropy_download_raw		{Zufallsdaten laden}
message	entropy_download_seed		{NetBSD Entropie-Datei laden}
message entropy_retry			{Erneut testen}

message entropy_enter_manual1
{Geben Sie bitte mehrere Zeilen zufällige Zeichen ein,
in denen genug Entropie enthalten sein sollte, die 256 Münzwürfen,
100 Würfen mit einem sechsseitigen Würfel oder 64 zufälligen hexadezimalen
Zeichen entspricht.}
 
message entropy_enter_manual2
{Falls Sie Daten von einem anderen System per Kopieren & Einfügen in dieses
Installationsprogramm übertragen können, können Sie die Ausgabe des
folgenden Kommandos (auf einem System dessen Entropie Sie vertrauen)
verwenden:}
 
message entropy_enter_manual3
{Benutzen Sie nicht die gleiche Eingabe für mehrere Installationen. 
Beenden Sie die Eingabe mit einer leeren Zeile.}

message entropy_manual_not_enough
{Sie haben nicht genug Zeichen eingegeben!}

message entropy_select_file
{Wählen Sie auf welche Art Sie die Zufallsdaten auf diesen Computer
übertragen wollen:}

message entropy_add_download_ftp
{Download per ftp}

message entropy_add_download_http
{Download per http}

message entropy_add_nfs
{Von einer NFS Freigabe laden}

message download_entropy
{Download starten}

message entropy_add_local
{Von einem lokalen Dateisystem laden (z.B. USB)}

message entropy_file
{Pfad/Datei}

message load_entropy
{Zufallsdatei laden}

message set_entropy_file
{Pfad der Zuffalsdatei}

/* Called with:				Example
 *  $0 = content of file		NetBSD entropy seed file
 */
message entropy_via_nfs
{Wählen Sie Server, Freigabe und Dateipfad von dem die $0 geladen werden kann.}

/* Called with:				Example
 *  $0 = content of file		NetBSD entropy seed file
 */
message entropy_via_download
{Da derzeit auf diesem System nicht genug Entropie vorhanden ist, sind alle
kryptographischen Operation durch replay-Attacken angreifbar. 
Verwenden Sie nur lokale vertrauenswürdige Netzwerke.}

message entropy_data
{Binärdatei mit Zuffallsdaten}

message entropy_data_hdr
{Auf einem System mit kryptographisch starkem Zufallszahlengenerator
können Sie zufällige Binärdaten z.B. so erzeugen:}

message entropy_seed
{NetBSD entropy Datei}

message entropy_seed_hdr
{Auf einem NetBSD System mit kryptographisch starkem Zufallszahlengenerator
können Sie einen Entropie-Schnappschuss folgendermaßen erstellen:}

message entropy_path_and_file
{Pfad und Dateiname}

message entropy_localfs
{Geben Sie das noch nicht gemountete lokale Gerät und dessen entsprechendes
Verzeichnis an, in dem die Zufallsdatei zu finden ist.}


File Added: src/usr.sbin/sysinst/msg.entropy.en
/*      $NetBSD: msg.entropy.en,v 1.1 2020/11/04 14:29:40 martin Exp $  */

/*
 * Copyright 2018 The NetBSD Foundation, Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED. IN NO EVENT SHALL PIERMONT INFORMATION SYSTEMS INC. BE
 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 *
 */

message not_enough_entropy
{This system seems to lack a cryptographically strong pseudo random
number generator. There is not enough entropy available to create secure
keys (e.g. ssh host keys). 

You may use random data generated on another computer and load it
here, or you could enter random characters manually. 
 
If you own a USB random number device, connect it now and select
the "Re-test" option.}

message entropy_add_manually		{Manual input of random data}
message entropy_download_raw		{Load random data}
message	entropy_download_seed		{Import a NetBSD entropy file}
message entropy_retry			{Re-test}

message entropy_enter_manual1
{Enter random characters.}

message entropy_enter_manual2
{They should contain at last 256 bits of randomness, as in 256 coin
tosses, 100 throws of a 6-sided die, 64 random hexadecimal digits, or
(if you are able to copy & paste output from another machine into this
installer) the output from running the following command on another
machine whose randomness you trust:}

message entropy_enter_manual3
{Do not use the same data for multiple installations. 
Terminate the input with an empty line.}

message entropy_manual_not_enough
{You did not enter enough characters!}

message entropy_select_file
{Please select how you want to transfer the random data file
to this machine:}

message entropy_add_download_ftp
{Download via ftp}

message entropy_add_download_http
{Download via http}

message download_entropy
{Start download}

message entropy_add_nfs
{Load from a NFS share}

message entropy_add_local
{Load from a local file system (e.g. a USB device)}

message entropy_file
{Path/file}

message load_entropy
{Load random data}

message set_entropy_file
{Random data file path}

/* Called with:				Example
 *  $0 = content of file		NetBSD entropy seed file
 */
message entropy_via_nfs
{Select a server, a share and the file path to load the $0.}

/* Called with:				Example
 *  $0 = content of file		NetBSD entropy seed file
 */
message entropy_via_download
{Since not enough entropy is available on this system, all crytographic
operations are suspect to replay attacks. 
Please only use trustworthy local networks.}

message entropy_data
{random data binary file}

message entropy_data_hdr
{On a system with cryptographically strong pseudo random number generator
you can create a file with random binary data like this:}

message entropy_seed
{NetBSD entropy seed file}

message entropy_seed_hdr
{On a NetBSD system with cryptographically strong pseudo random number
generator you can create an entropy snapshot like this:}

message entropy_path_and_file
{Path and filename}

message entropy_localfs
{Enter the unmounted local device and directory on that device where
the random data is located.}


File Added: src/usr.sbin/sysinst/msg.entropy.es
/*      $NetBSD: msg.entropy.es,v 1.1 2020/11/04 14:29:40 martin Exp $  */

/*
 * Copyright 2018 The NetBSD Foundation, Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED. IN NO EVENT SHALL PIERMONT INFORMATION SYSTEMS INC. BE
 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 *
 */

message not_enough_entropy
{This system seems to lack a cryptographically strong pseudo random
number generator. There is not enough entropy available to create secure
keys (e.g. ssh host keys). 

You may use random data generated on another computer and load it
here, or you could enter random characters manually. 
 
If you own a USB random number device, connect it now and select
the "Re-test" option.}

message entropy_add_manually		{Manual input of random data}
message entropy_download_raw		{Load random data}
message	entropy_download_seed		{Import a NetBSD entropy file}
message entropy_retry			{Re-test}

message entropy_enter_manual1
{Enter random characters.}

message entropy_enter_manual2
{They should contain at last 256 bits of randomness, as in 256 coin
tosses, 100 throws of a 6-sided die, 64 random hexadecimal digits, or
(if you are able to copy & paste output from another machine into this
installer) the output from running the following command on another
machine whose randomness you trust:}

message entropy_enter_manual3
{Do not use the same data for multiple installations. 
Terminate the input with an empty line.}

message entropy_manual_not_enough
{You did not enter enough characters!}

message entropy_select_file
{Please select how you want to transfer the random data file
to this machine:}

message entropy_add_download_ftp
{Download via ftp}

message entropy_add_download_http
{Download via http}

message download_entropy
{Start download}

message entropy_add_nfs
{Load from a NFS share}

message entropy_add_local
{Laod from a local file system (e.g. a USB device)}

message entropy_file
{Path/file}

message load_entropy
{Load random data}

message set_entropy_file
{Random data file path}

/* Called with:				Example
 *  $0 = content of file		NetBSD entropy seed file
 */
message entropy_via_nfs
{Select a server, a share and the file path to load the $0.}

/* Called with:				Example
 *  $0 = content of file		NetBSD entropy seed file
 */
message entropy_via_download
{Since not enough entropy is available on this system, all crytographic
operations are suspect to replay attacks. 
Please only use trustworthy local networks.}

message entropy_data
{random data binary file}

message entropy_data_hdr
{On a system with cryptographically strong pseudo random number generator
you can create a file with random binary data like this:}

message entropy_seed
{NetBSD entropy seed file}

message entropy_seed_hdr
{On a NetBSD system with cryptographically strong pseudo random number
generator you can create an entropy snapshot like this:}

message entropy_path_and_file
{Path and filename}

message entropy_localfs
{Enter the unmounted local device and directory on that device where
the random data is located.}


File Added: src/usr.sbin/sysinst/msg.entropy.fr
/*      $NetBSD: msg.entropy.fr,v 1.1 2020/11/04 14:29:40 martin Exp $  */

/*
 * Copyright 2018 The NetBSD Foundation, Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED. IN NO EVENT SHALL PIERMONT INFORMATION SYSTEMS INC. BE
 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 *
 */

message not_enough_entropy
{This system seems to lack a cryptographically strong pseudo random
number generator. There is not enough entropy available to create secure
keys (e.g. ssh host keys). 

You may use random data generated on another computer and load it
here, or you could enter random characters manually. 
 
If you own a USB random number device, connect it now and select
the "Re-test" option.}

message entropy_add_manually		{Manual input of random data}
message entropy_download_raw		{Load random data}
message	entropy_download_seed		{Import a NetBSD entropy file}
message entropy_retry			{Re-test}

message entropy_enter_manual1
{Enter random characters.}

message entropy_enter_manual2
{They should contain at last 256 bits of randomness, as in 256 coin
tosses, 100 throws of a 6-sided die, 64 random hexadecimal digits, or
(if you are able to copy & paste output from another machine into this
installer) the output from running the following command on another
machine whose randomness you trust:}

message entropy_enter_manual3
{Do not use the same data for multiple installations. 
Terminate the input with an empty line.}

message entropy_manual_not_enough
{You did not enter enough characters!}

message entropy_select_file
{Please select how you want to transfer the random data file
to this machine:}

message entropy_add_download_ftp
{Download via ftp}

message entropy_add_download_http
{Download via http}

message download_entropy
{Start download}

message entropy_add_nfs
{Load from a NFS share}

message entropy_add_local
{Load from a local file system (e.g. a USB device)}

message entropy_file
{Path/file}

message load_entropy
{Load random data}

message set_entropy_file
{Random data file path}

/* Called with:				Example
 *  $0 = content of file		NetBSD entropy seed file
 */
message entropy_via_nfs
{Select a server, a share and the file path to load the $0.}

/* Called with:				Example
 *  $0 = content of file		NetBSD entropy seed file
 */
message entropy_via_download
{Since not enough entropy is available on this system, all crytographic
operations are suspect to replay attacks. 
Please only use trustworthy local networks.}

message entropy_data
{random data binary file}

message entropy_data_hdr
{On a system with cryptographically strong pseudo random number generator
you can create a file with random binary data like this:}

message entropy_seed
{NetBSD entropy seed file}

message entropy_seed_hdr
{On a NetBSD system with cryptographically strong pseudo random number
generator you can create an entropy snapshot like this:}

message entropy_path_and_file
{Path and filename}

message entropy_localfs
{Enter the unmounted local device and directory on that device where
the random data is located.}


File Added: src/usr.sbin/sysinst/msg.entropy.pl
/*      $NetBSD: msg.entropy.pl,v 1.1 2020/11/04 14:29:40 martin Exp $  */

/*
 * Copyright 2018 The NetBSD Foundation, Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 *
 * THIS SOFTWARE IS PROVIDED BY PIERMONT INFORMATION SYSTEMS INC. ``AS IS''
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED. IN NO EVENT SHALL PIERMONT INFORMATION SYSTEMS INC. BE
 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 * THE POSSIBILITY OF SUCH DAMAGE.
 *
 */

message not_enough_entropy
{This system seems to lack a cryptographically strong pseudo random
number generator. There is not enough entropy available to create secure
keys (e.g. ssh host keys). 

You may use random data generated on another computer and load it
here, or you could enter random characters manually. 
 
If you own a USB random number device, connect it now and select
the "Re-test" option.}

message entropy_add_manually		{Manual input of random data}
message entropy_download_raw		{Load random data}
message	entropy_download_seed		{Import a NetBSD entropy file}
message entropy_retry			{Re-test}

message entropy_enter_manual1
{Enter random characters.}

message entropy_enter_manual2
{They should contain at last 256 bits of randomness, as in 256 coin
tosses, 100 throws of a 6-sided die, 64 random hexadecimal digits, or
(if you are able to copy & paste output from another machine into this
installer) the output from running the following command on another
machine whose randomness you trust:}

message entropy_enter_manual3
{Do not use the same data for multiple installations. 
Terminate the input with an empty line.}

message entropy_manual_not_enough
{You did not enter enough characters!}

message entropy_select_file
{Please select how you want to transfer the random data file
to this machine:}

message entropy_add_download_ftp
{Download via ftp}

message entropy_add_download_http
{Download via http}

message download_entropy
{Start download}

message entropy_add_nfs
{Load from a NFS share}

message entropy_add_local
{Load from a local file system (e.g. a USB device)}

message entropy_file
{Path/file}

message load_entropy
{Load random data}

message set_entropy_file
{Random data file path}

/* Called with:				Example
 *  $0 = content of file		NetBSD entropy seed file
 */
message entropy_via_nfs
{Select a server, a share and the file path to load the $0.}

/* Called with:				Example
 *  $0 = content of file		NetBSD entropy seed file
 */
message entropy_via_download
{Since not enough entropy is available on this system, all crytographic
operations are suspect to replay attacks. 
Please only use trustworthy local networks.}

message entropy_data
{random data binary file}

message entropy_data_hdr
{On a system with cryptographically strong pseudo random number generator
you can create a file with random binary data like this:}

message entropy_seed
{NetBSD entropy seed file}

message entropy_seed_hdr
{On a NetBSD system with cryptographically strong pseudo random number
generator you can create an entropy snapshot like this:}

message entropy_path_and_file
{Path and filename}

message entropy_localfs
{Enter the unmounted local device and directory on that device where
the random data is located.}


cvs diff -r1.23 -r1.24 src/usr.sbin/sysinst/menus.mi (expand / switch to unified diff)

--- src/usr.sbin/sysinst/menus.mi 2020/10/27 15:28:01 1.23
+++ src/usr.sbin/sysinst/menus.mi 2020/11/04 14:29:40 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: menus.mi,v 1.23 2020/10/27 15:28:01 martin Exp $ */ 1/* $NetBSD: menus.mi,v 1.24 2020/11/04 14:29:40 martin Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2003 The NetBSD Foundation, Inc. 4 * Copyright (c) 2003 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by David Laight. 8 * by David Laight.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -651,15 +651,13 @@ menu convertscheme, title MSG_cvtscheme_ @@ -651,15 +651,13 @@ menu convertscheme, title MSG_cvtscheme_
651 option MSG_cvtscheme_delete, exit, action { *(int*)arg = 1; }; 651 option MSG_cvtscheme_delete, exit, action { *(int*)arg = 1; };
652 option MSG_cvtscheme_convert, exit, action { *(int*)arg = 2; }; 652 option MSG_cvtscheme_convert, exit, action { *(int*)arg = 2; };
653 option MSG_cvtscheme_abort, exit, action { *(int*)arg = 3; }; 653 option MSG_cvtscheme_abort, exit, action { *(int*)arg = 3; };
654 654
655 655
656menu reedit, title MSG_reeditpart, y=-10; 656menu reedit, title MSG_reeditpart, y=-10;
657 expand action { expand_all_option_texts(menu, arg); }; 657 expand action { expand_all_option_texts(menu, arg); };
658 option MSG_reedit_partitions, exit, 658 option MSG_reedit_partitions, exit,
659 action {((arg_rep_int*)arg)->rv = 1;}; 659 action {((arg_rep_int*)arg)->rv = 1;};
660 option MSG_use_partitions_anyway, exit, 660 option MSG_use_partitions_anyway, exit,
661 action {((arg_rep_int*)arg)->rv = 2;}; 661 action {((arg_rep_int*)arg)->rv = 2;};
662 option MSG_abort_installation, exit, 662 option MSG_abort_installation, exit,
663 action {((arg_rep_int*)arg)->rv = 0;}; 663 action {((arg_rep_int*)arg)->rv = 0;};
664 
665 

cvs diff -r1.26 -r1.27 src/usr.sbin/sysinst/msg.mi.de (expand / switch to unified diff)

--- src/usr.sbin/sysinst/msg.mi.de 2020/10/27 15:28:01 1.26
+++ src/usr.sbin/sysinst/msg.mi.de 2020/11/04 14:29:40 1.27
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: msg.mi.de,v 1.26 2020/10/27 15:28:01 martin Exp $ */ 1/* $NetBSD: msg.mi.de,v 1.27 2020/11/04 14:29:40 martin Exp $ */
2 2
3/* 3/*
4 * Copyright 1997 Piermont Information Systems Inc. 4 * Copyright 1997 Piermont Information Systems Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Written by Philip A. Nelson for Piermont Information Systems Inc. 7 * Written by Philip A. Nelson for Piermont Information Systems Inc.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -1237,41 +1237,30 @@ sollen zum Herunterladen von pkgsrc verw @@ -1237,41 +1237,30 @@ sollen zum Herunterladen von pkgsrc verw
1237gesetzt wird, dann wird kein Passwort benötigt. 1237gesetzt wird, dann wird kein Passwort benötigt.
1238 1238
1239} 1239}
1240message Pkgsrc_dir {pkgsrc-Verzeichnis} 1240message Pkgsrc_dir {pkgsrc-Verzeichnis}
1241message get_pkgsrc {pkgsrc herunterladen und extrahieren} 1241message get_pkgsrc {pkgsrc herunterladen und extrahieren}
1242message retry_pkgsrc_network {Netzwerkkonfiguration fehlgeschlagen. Noch einmal  1242message retry_pkgsrc_network {Netzwerkkonfiguration fehlgeschlagen. Noch einmal
1243versuchen?} 1243versuchen?}
1244message quit_pkgsrc {Ohne Installation von pkgsrc beenden.} 1244message quit_pkgsrc {Ohne Installation von pkgsrc beenden.}
1245message quit_pkgs_install {Installation von binär-Paketen beenden.} 1245message quit_pkgs_install {Installation von binär-Paketen beenden.}
1246message pkgin_failed  1246message pkgin_failed
1247{Die Installation von pkgin ist fehlgeschlagen, evtl. weil keine Binärpakete  1247{Die Installation von pkgin ist fehlgeschlagen, evtl. weil keine Binärpakete
1248vorhanden sind. Bitte den Pfad der Pakete überprüfen und noch einmal versuchen.} 1248vorhanden sind. Bitte den Pfad der Pakete überprüfen und noch einmal versuchen.}
1249message failed {Fehlgeschlagen} 1249message failed {Fehlgeschlagen}
1250message notsupported {Operation wird nicht unterstützt!} 
1251message askfsmountadv {Mountpoint oder 'raid' oder 'cgd' oder 'lvm'?} 1250message askfsmountadv {Mountpoint oder 'raid' oder 'cgd' oder 'lvm'?}
1252message partman {Erweiterte Partitionierung} 1251message partman {Erweiterte Partitionierung}
1253message edit_parts {Partitionen bearbeiten} 
1254message editpart {Partitionen bearbeiten} 1252message editpart {Partitionen bearbeiten}
1255message switch_parts {Switch partitioning scheme} 
1256message fmtasraid {Als RAID Komponente formatieren} 
1257message fmtaslvm {Als LVM-PV formatieren} 
1258message encrypt {Verschlüsseln (CGD)} 
1259message setbootable {Boot-Flag} 1253message setbootable {Boot-Flag}
1260message erase {Safe Erase} 
1261message undo {Rückgängigmachen von Änderungen} 
1262message unconfig {Dekonfigurieren} 
1263message edit {Bearbeiten} 
1264message doumount {Force-umount} 
1265 1254
1266message fremove {ENTFERNEN} 1255message fremove {ENTFERNEN}
1267message remove {Entfernen} 1256message remove {Entfernen}
1268message add {Hinzufügen} 1257message add {Hinzufügen}
1269message auto {auto} 1258message auto {auto}
1270 1259
1271message removepartswarn {Sie löschen alle existierenden Partitionen auf der Festplatte!} 1260message removepartswarn {Sie löschen alle existierenden Partitionen auf der Festplatte!}
1272message saveprompt {Speichern Sie die Änderungen vor dem Abschluss?} 1261message saveprompt {Speichern Sie die Änderungen vor dem Abschluss?}
1273message cantsave {Änderungen können nicht gespeichert werden.} 1262message cantsave {Änderungen können nicht gespeichert werden.}
1274message noroot {Kein Root-Partition definiert ist, kann nicht fortgesetzt werden \n} 1263message noroot {Kein Root-Partition definiert ist, kann nicht fortgesetzt werden \n}
1275 1264
1276message addusername {8 character username to add} 1265message addusername {8 character username to add}
1277message addusertowheel {Do you wish to add this user to group wheel?} 1266message addusertowheel {Do you wish to add this user to group wheel?}

cvs diff -r1.34 -r1.35 src/usr.sbin/sysinst/msg.mi.en (expand / switch to unified diff)

--- src/usr.sbin/sysinst/msg.mi.en 2020/10/27 15:28:01 1.34
+++ src/usr.sbin/sysinst/msg.mi.en 2020/11/04 14:29:40 1.35
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: msg.mi.en,v 1.34 2020/10/27 15:28:01 martin Exp $ */ 1/* $NetBSD: msg.mi.en,v 1.35 2020/11/04 14:29:40 martin Exp $ */
2 2
3/* 3/*
4 * Copyright 1997 Piermont Information Systems Inc. 4 * Copyright 1997 Piermont Information Systems Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Written by Philip A. Nelson for Piermont Information Systems Inc. 7 * Written by Philip A. Nelson for Piermont Information Systems Inc.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -1166,41 +1166,29 @@ The following are the host, directory, u @@ -1166,41 +1166,29 @@ The following are the host, directory, u
1166will be used. If "user" is "ftp", then the password is not needed. 1166will be used. If "user" is "ftp", then the password is not needed.
1167 1167
1168} 1168}
1169message Pkgsrc_dir {pkgsrc directory} 1169message Pkgsrc_dir {pkgsrc directory}
1170message get_pkgsrc {Fetch and unpack pkgsrc} 1170message get_pkgsrc {Fetch and unpack pkgsrc}
1171message retry_pkgsrc_network {Network configuration failed. Retry?} 1171message retry_pkgsrc_network {Network configuration failed. Retry?}
1172message quit_pkgsrc {Quit without installing pkgsrc} 1172message quit_pkgsrc {Quit without installing pkgsrc}
1173message quit_pkgs_install {Quit installing binary pkgs} 1173message quit_pkgs_install {Quit installing binary pkgs}
1174message pkgin_failed 1174message pkgin_failed
1175{Installation of pkgin failed, possibly because no binary packages 1175{Installation of pkgin failed, possibly because no binary packages
1176exist. Please check the package path and try again.} 1176exist. Please check the package path and try again.}
1177message failed {Failed} 1177message failed {Failed}
1178 1178
1179message notsupported {Operation not supported!} 
1180message askfsmountadv {Mountpoint (or 'raid', 'cgd', 'lvm')?} 1179message askfsmountadv {Mountpoint (or 'raid', 'cgd', 'lvm')?}
1181message partman {Extended partitioning} 1180message partman {Extended partitioning}
1182message edit_parts {Edit partitions} 
1183message editpart {Edit partitions} 1181message editpart {Edit partitions}
1184message switch_parts {Switch partitioning scheme} 
1185message fmtasraid {Format as RAID} 
1186message fmtaslvm {Format as LVM PV} 
1187message encrypt {Encrypt (CGD)} 
1188message setbootable {Bootable flag} 
1189message erase {Safe erase} 
1190message undo {Undo changes} 
1191message unconfig {Unconfigure} 
1192message edit {Edit} 
1193message doumount {Force umount} 
1194 1182
1195message fremove {REMOVE} 1183message fremove {REMOVE}
1196message remove {Remove} 1184message remove {Remove}
1197message add {Add} 1185message add {Add}
1198message auto {auto} 1186message auto {auto}
1199 1187
1200message removepartswarn {This removes all partitions on the disk!} 1188message removepartswarn {This removes all partitions on the disk!}
1201message saveprompt {Save changes before finishing?} 1189message saveprompt {Save changes before finishing?}
1202message cantsave {Changes cannot be saved.} 1190message cantsave {Changes cannot be saved.}
1203message noroot {No root partition defined. Cannot continue\n} 1191message noroot {No root partition defined. Cannot continue\n}
1204 1192
1205message addusername {8 character username to add} 1193message addusername {8 character username to add}
1206message addusertowheel {Do you wish to add this user to group wheel?} 1194message addusertowheel {Do you wish to add this user to group wheel?}

cvs diff -r1.34 -r1.35 src/usr.sbin/sysinst/msg.mi.pl (expand / switch to unified diff)

--- src/usr.sbin/sysinst/msg.mi.pl 2020/10/27 15:28:01 1.34
+++ src/usr.sbin/sysinst/msg.mi.pl 2020/11/04 14:29:40 1.35
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: msg.mi.pl,v 1.34 2020/10/27 15:28:01 martin Exp $ */ 1/* $NetBSD: msg.mi.pl,v 1.35 2020/11/04 14:29:40 martin Exp $ */
2/* Based on english version: */ 2/* Based on english version: */
3/* NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp */ 3/* NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp */
4 4
5/* 5/*
6 * Copyright 1997 Piermont Information Systems Inc. 6 * Copyright 1997 Piermont Information Systems Inc.
7 * All rights reserved. 7 * All rights reserved.
8 * 8 *
9 * Written by Philip A. Nelson for Piermont Information Systems Inc. 9 * Written by Philip A. Nelson for Piermont Information Systems Inc.
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
12 * modification, are permitted provided that the following conditions 12 * modification, are permitted provided that the following conditions
13 * are met: 13 * are met:
14 * 1. Redistributions of source code must retain the above copyright 14 * 1. Redistributions of source code must retain the above copyright
@@ -1166,41 +1166,29 @@ nazwa uzytkownika to "ftp". @@ -1166,41 +1166,29 @@ nazwa uzytkownika to "ftp".
1166} 1166}
1167message Pkgsrc_dir {katalog pkgsrc} 1167message Pkgsrc_dir {katalog pkgsrc}
1168message get_pkgsrc {Pobierz i rozpakuj pkgsrc} 1168message get_pkgsrc {Pobierz i rozpakuj pkgsrc}
1169message retry_pkgsrc_network {Konfiguracja sieci nie powiodla sie. Sprobowac 1169message retry_pkgsrc_network {Konfiguracja sieci nie powiodla sie. Sprobowac
1170ponownie?} 1170ponownie?}
1171message quit_pkgsrc {Zakoncz bez zainstalowania pkgsrc} 1171message quit_pkgsrc {Zakoncz bez zainstalowania pkgsrc}
1172message quit_pkgs_install {Zakoncz bez zainstalowania bin pkg} 1172message quit_pkgs_install {Zakoncz bez zainstalowania bin pkg}
1173message pkgin_failed  1173message pkgin_failed
1174{Instalacja pkgin nie powiodla sie, prawdopodobnie dlatego ze nie znaleziono  1174{Instalacja pkgin nie powiodla sie, prawdopodobnie dlatego ze nie znaleziono
1175pakietow binarnych. 1175pakietow binarnych.
1176Sprawdz sciezke pakietow i sprobuj ponownie.} 1176Sprawdz sciezke pakietow i sprobuj ponownie.}
1177message failed {Nie powiodlo sie} 1177message failed {Nie powiodlo sie}
1178 1178
1179message notsupported {Operacja nie jest obslugiwana!} 
1180message askfsmountadv {Punkt montowania (lub "raid", "cgd" albo "lvm")?} 1179message askfsmountadv {Punkt montowania (lub "raid", "cgd" albo "lvm")?}
1181message partman {Partycje rozszerzone} 1180message partman {Partycje rozszerzone}
1182message edit_parts {Edytuj partycje} 
1183message editpart {Edytuj partycje} 1181message editpart {Edytuj partycje}
1184message switch_parts {Switch partitioning scheme} 
1185message fmtasraid {Formatuj jako RAID} 
1186message fmtaslvm {Formatuj jak LVM PV} 
1187message encrypt {Szyfrowanie (CGD)} 
1188message setbootable {Rozruchowy} 
1189message erase {Bezpieczne kasowanie} 
1190message undo {Cofanie zmian} 
1191message unconfig {Cofnij konfiguracje} 
1192message edit {Edytuj} 
1193message doumount {Wymus odmontowanie} 
1194 1182
1195message fremove {USUN} 1183message fremove {USUN}
1196message remove {Usun} 1184message remove {Usun}
1197message add {Dodaj} 1185message add {Dodaj}
1198message auto {auto} 1186message auto {auto}
1199 1187
1200message removepartswarn {To usunie wszystkie partycje na dysku!} 1188message removepartswarn {To usunie wszystkie partycje na dysku!}
1201message saveprompt {Zapisac zmiany przed zakonczeniem?} 1189message saveprompt {Zapisac zmiany przed zakonczeniem?}
1202message cantsave {Zmiany nie moga byc zapisane.} 1190message cantsave {Zmiany nie moga byc zapisane.}
1203message noroot {Brak zedfiniowanej partycji /. Nie mozna kontynuowac.\n} 1191message noroot {Brak zedfiniowanej partycji /. Nie mozna kontynuowac.\n}
1204 1192
1205message addusername {Nazwa nowego uzytkownika (8 zn.)} 1193message addusername {Nazwa nowego uzytkownika (8 zn.)}
1206message addusertowheel {Chcesz dodac tego uzytkownika do grupy wheel?} 1194message addusertowheel {Chcesz dodac tego uzytkownika do grupy wheel?}
@@ -1462,14 +1450,13 @@ message running_system {current system @@ -1462,14 +1450,13 @@ message running_system {current system
1462message clone_from_elsewhere {Clone external partition(s)} 1450message clone_from_elsewhere {Clone external partition(s)}
1463message select_foreign_part 1451message select_foreign_part
1464{Please select an external source partition:} 1452{Please select an external source partition:}
1465message select_source_hdr 1453message select_source_hdr
1466{Your currently selected source partitions are:} 1454{Your currently selected source partitions are:}
1467message clone_with_data {Clone with data} 1455message clone_with_data {Clone with data}
1468message select_source_add {Add another partition} 1456message select_source_add {Add another partition}
1469message clone_target_end {Add at end} 1457message clone_target_end {Add at end}
1470message clone_target_hdr 1458message clone_target_hdr
1471{Insert cloned partitions before:} 1459{Insert cloned partitions before:}
1472message clone_target_disp {cloned partition(s)} 1460message clone_target_disp {cloned partition(s)}
1473message clone_src_done 1461message clone_src_done
1474{Source selection OK, proceed to target selection} 1462{Source selection OK, proceed to target selection}
1475 

cvs diff -r1.28 -r1.29 src/usr.sbin/sysinst/msg.mi.es (expand / switch to unified diff)

--- src/usr.sbin/sysinst/msg.mi.es 2020/10/27 15:28:01 1.28
+++ src/usr.sbin/sysinst/msg.mi.es 2020/11/04 14:29:40 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: msg.mi.es,v 1.28 2020/10/27 15:28:01 martin Exp $ */ 1/* $NetBSD: msg.mi.es,v 1.29 2020/11/04 14:29:40 martin Exp $ */
2 2
3/* 3/*
4 * Copyright 1997 Piermont Information Systems Inc. 4 * Copyright 1997 Piermont Information Systems Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Written by Philip A. Nelson for Piermont Information Systems Inc. 7 * Written by Philip A. Nelson for Piermont Information Systems Inc.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -1217,41 +1217,29 @@ la contraseña es opcional. @@ -1217,41 +1217,29 @@ la contraseña es opcional.
1217message Pkgsrc_dir {Directorio de pkgsrc} 1217message Pkgsrc_dir {Directorio de pkgsrc}
1218message get_pkgsrc 1218message get_pkgsrc
1219{Descargar y desempaquetar pkgsrc} 1219{Descargar y desempaquetar pkgsrc}
1220message retry_pkgsrc_network 1220message retry_pkgsrc_network
1221{La configuración de la red ha fallado. ¿Reintentar?} 1221{La configuración de la red ha fallado. ¿Reintentar?}
1222message quit_pkgsrc {Salir sin instalar pkgsrc} 1222message quit_pkgsrc {Salir sin instalar pkgsrc}
1223message quit_pkgs_install {Salir sin instalar bin pkg} 1223message quit_pkgs_install {Salir sin instalar bin pkg}
1224message pkgin_failed  1224message pkgin_failed
1225{La instalación de pkgin ha fallado, posiblemente porque no existen 1225{La instalación de pkgin ha fallado, posiblemente porque no existen
1226paquetes binarios. Por favor verifique el camino a los paquetes y 1226paquetes binarios. Por favor verifique el camino a los paquetes y
1227reinténtelo de nuevo.} 1227reinténtelo de nuevo.}
1228message failed {Error} 1228message failed {Error}
1229 1229
1230message notsupported {Operación no admitida!} 
1231message askfsmountadv {Punto de montaje o 'raid' o 'CGD' o 'lvm'?} 1230message askfsmountadv {Punto de montaje o 'raid' o 'CGD' o 'lvm'?}
1232message partman {Partición extendida} 1231message partman {Partición extendida}
1233message edit_parts {Editar particiones} 
1234message editpart {Editar particiones} 1232message editpart {Editar particiones}
1235message switch_parts {Switch partitioning scheme} 
1236message fmtasraid {Formato como RAID} 
1237message fmtaslvm {Formato como LVM PV} 
1238message encrypt {Cifrar (CGD)} 
1239message setbootable {La bandera de arranque} 
1240message erase {Borrado seguro} 
1241message undo {Deshacer los cambios} 
1242message unconfig {Desconfigurar} 
1243message edit {Editar} 
1244message doumount {Fuerza umount} 
1245 1233
1246message fremove {QUITAR} 1234message fremove {QUITAR}
1247message remove {Quitar} 1235message remove {Quitar}
1248message add {Añadir} 1236message add {Añadir}
1249message auto {auto} 1237message auto {auto}
1250 1238
1251message removepartswarn {Esta eliminar todas las particiones en el disco!} 1239message removepartswarn {Esta eliminar todas las particiones en el disco!}
1252message saveprompt {Guarde los cambios antes de terminar?} 1240message saveprompt {Guarde los cambios antes de terminar?}
1253message cantsave {Los cambios no se pueden guardar.} 1241message cantsave {Los cambios no se pueden guardar.}
1254message noroot {No hay una partición raíz definida, no puede continuar \n} 1242message noroot {No hay una partición raíz definida, no puede continuar \n}
1255 1243
1256message addusername {8 character username to add} 1244message addusername {8 character username to add}
1257message addusertowheel {Do you wish to add this user to group wheel?} 1245message addusertowheel {Do you wish to add this user to group wheel?}
@@ -1525,14 +1513,13 @@ message running_system {current system @@ -1525,14 +1513,13 @@ message running_system {current system
1525message clone_from_elsewhere {Clone external partition(s)} 1513message clone_from_elsewhere {Clone external partition(s)}
1526message select_foreign_part 1514message select_foreign_part
1527{Please select an external source partition:} 1515{Please select an external source partition:}
1528message select_source_hdr 1516message select_source_hdr
1529{Your currently selected source partitions are:} 1517{Your currently selected source partitions are:}
1530message clone_with_data {Clone with data} 1518message clone_with_data {Clone with data}
1531message select_source_add {Add another partition} 1519message select_source_add {Add another partition}
1532message clone_target_end {Add at end} 1520message clone_target_end {Add at end}
1533message clone_target_hdr 1521message clone_target_hdr
1534{Insert cloned partitions before:} 1522{Insert cloned partitions before:}
1535message clone_target_disp {cloned partition(s)} 1523message clone_target_disp {cloned partition(s)}
1536message clone_src_done 1524message clone_src_done
1537{Source selection OK, proceed to target selection} 1525{Source selection OK, proceed to target selection}
1538 

cvs diff -r1.33 -r1.34 src/usr.sbin/sysinst/msg.mi.fr (expand / switch to unified diff)

--- src/usr.sbin/sysinst/msg.mi.fr 2020/10/27 15:28:01 1.33
+++ src/usr.sbin/sysinst/msg.mi.fr 2020/11/04 14:29:40 1.34
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: msg.mi.fr,v 1.33 2020/10/27 15:28:01 martin Exp $ */ 1/* $NetBSD: msg.mi.fr,v 1.34 2020/11/04 14:29:40 martin Exp $ */
2 2
3/* 3/*
4 * Copyright 1997 Piermont Information Systems Inc. 4 * Copyright 1997 Piermont Information Systems Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Written by Philip A. Nelson for Piermont Information Systems Inc. 7 * Written by Philip A. Nelson for Piermont Information Systems Inc.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -1256,41 +1256,29 @@ n'est pas requis. @@ -1256,41 +1256,29 @@ n'est pas requis.
1256} 1256}
1257message Pkgsrc_dir {Répertoire pkgsrc} 1257message Pkgsrc_dir {Répertoire pkgsrc}
1258message get_pkgsrc 1258message get_pkgsrc
1259{Obtenir et extraire pkgsrc} 1259{Obtenir et extraire pkgsrc}
1260message retry_pkgsrc_network {La configuration du réseau a échoué. Réessayer ?} 1260message retry_pkgsrc_network {La configuration du réseau a échoué. Réessayer ?}
1261message quit_pkgsrc {Quitter sans installer pkgsrc} 1261message quit_pkgsrc {Quitter sans installer pkgsrc}
1262message quit_pkgs_install {Quitter sans installer bin pkg} 1262message quit_pkgs_install {Quitter sans installer bin pkg}
1263message pkgin_failed  1263message pkgin_failed
1264{L'installation de pkgin a échoué, peut-être parce que son paquetage binaire 1264{L'installation de pkgin a échoué, peut-être parce que son paquetage binaire
1265n'existe pas. Vérifiez le chemin et essayez à nouveau.} 1265n'existe pas. Vérifiez le chemin et essayez à nouveau.}
1266message failed {Échoué} 1266message failed {Échoué}
1267 1267
1268 1268
1269message notsupported {Le fonctionnement n'est pas pris en charge!} 
1270message askfsmountadv {Point de montage ou de 'raid' ou 'cgd' ou 'lvm'?} 1269message askfsmountadv {Point de montage ou de 'raid' ou 'cgd' ou 'lvm'?}
1271message partman {Partitionnement étendu} 1270message partman {Partitionnement étendu}
1272message edit_parts {Modifier les partitions} 
1273message editpart {Modifier les partitions} 1271message editpart {Modifier les partitions}
1274message switch_parts {Switch partitioning scheme} 
1275message fmtasraid {Format en RAID} 
1276message fmtaslvm {Format de LVM PV} 
1277message encrypt {Crypter (CGD)} 
1278message setbootable {Drapeau d'amorçage} 
1279message erase {Fonction d'effacement sécurisé} 
1280message undo {Annuler les changements} 
1281message unconfig {Annulation de la configuration} 
1282message edit {Éditer} 
1283message doumount {Groupe umount} 
1284 1272
1285message fremove {ENLEVER} 1273message fremove {ENLEVER}
1286message remove {Supprimer} 1274message remove {Supprimer}
1287message add {Ajouter} 1275message add {Ajouter}
1288message auto {auto} 1276message auto {auto}
1289 1277
1290message removepartswarn {Cette supprimer toutes les partitions sur le disque!} 1278message removepartswarn {Cette supprimer toutes les partitions sur le disque!}
1291message saveprompt {Enregistrer les modifications avant de terminer?} 1279message saveprompt {Enregistrer les modifications avant de terminer?}
1292message cantsave {Aucune modification ne peut être sauvé.} 1280message cantsave {Aucune modification ne peut être sauvé.}
1293message noroot {Aucune partition racine défini, ne peut pas continuer \n continue\n} 1281message noroot {Aucune partition racine défini, ne peut pas continuer \n continue\n}
1294 1282
1295message addusername {Nom d'utilisateur (8 caractères)} 1283message addusername {Nom d'utilisateur (8 caractères)}
1296message addusertowheel {Ajouter cet utilisateur au groupe "wheel" ?} 1284message addusertowheel {Ajouter cet utilisateur au groupe "wheel" ?}
@@ -1556,14 +1544,13 @@ message running_system {current system @@ -1556,14 +1544,13 @@ message running_system {current system
1556message clone_from_elsewhere {Clone external partition(s)} 1544message clone_from_elsewhere {Clone external partition(s)}
1557message select_foreign_part 1545message select_foreign_part
1558{Please select an external source partition:} 1546{Please select an external source partition:}
1559message select_source_hdr 1547message select_source_hdr
1560{Your currently selected source partitions are:} 1548{Your currently selected source partitions are:}
1561message clone_with_data {Clone with data} 1549message clone_with_data {Clone with data}
1562message select_source_add {Add another partition} 1550message select_source_add {Add another partition}
1563message clone_target_end {Add at end} 1551message clone_target_end {Add at end}
1564message clone_target_hdr 1552message clone_target_hdr
1565{Insert cloned partitions before:} 1553{Insert cloned partitions before:}
1566message clone_target_disp {cloned partition(s)} 1554message clone_target_disp {cloned partition(s)}
1567message clone_src_done 1555message clone_src_done
1568{Source selection OK, proceed to target selection} 1556{Source selection OK, proceed to target selection}
1569 

cvs diff -r1.2 -r1.3 src/usr.sbin/sysinst/msg.pm.de (expand / switch to unified diff)

--- src/usr.sbin/sysinst/msg.pm.de 2020/01/09 13:22:30 1.2
+++ src/usr.sbin/sysinst/msg.pm.de 2020/11/04 14:29:40 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: msg.pm.de,v 1.2 2020/01/09 13:22:30 martin Exp $ */ 1/* $NetBSD: msg.pm.de,v 1.3 2020/11/04 14:29:40 martin Exp $ */
2 2
3/* 3/*
4 * Copyright 1997 Piermont Information Systems Inc. 4 * Copyright 1997 Piermont Information Systems Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Written by Philip A. Nelson for Piermont Information Systems Inc. 7 * Written by Philip A. Nelson for Piermont Information Systems Inc.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -141,13 +141,27 @@ message lvmlv_regsiz_fmt {MirrorLogRegio @@ -141,13 +141,27 @@ message lvmlv_regsiz_fmt {MirrorLogRegio
141message lvmlv_pers_fmt {Persistent Minor-Nummer} 141message lvmlv_pers_fmt {Persistent Minor-Nummer}
142message lvmlv_readahsect_fmt {ReadAheadSectors} 142message lvmlv_readahsect_fmt {ReadAheadSectors}
143message lvmlv_stripes_fmt {Stripes} 143message lvmlv_stripes_fmt {Stripes}
144message lvmlv_stripesiz_fmt {StripeSize} 144message lvmlv_stripesiz_fmt {StripeSize}
145message lvmlv_zero_fmt {Nullen des ersten KB} 145message lvmlv_zero_fmt {Nullen des ersten KB}
146message lvmlv_name_ask {Name?} 146message lvmlv_name_ask {Name?}
147message lvmlv_size_ask {Größe (MB)?} 147message lvmlv_size_ask {Größe (MB)?}
148message lvmlv_extnum_ask {LogicalExtentsNumber?} 148message lvmlv_extnum_ask {LogicalExtentsNumber?}
149message lvmlv_minor_ask {Minor-Nummer?} 149message lvmlv_minor_ask {Minor-Nummer?}
150message lvmlv_mirrors_ask {Spiegel?} 150message lvmlv_mirrors_ask {Spiegel?}
151message lvmlv_regsiz_ask {MirrorLogRegionSize?} 151message lvmlv_regsiz_ask {MirrorLogRegionSize?}
152message lvmlv_readahsect_ask {ReadAheadSectors?} 152message lvmlv_readahsect_ask {ReadAheadSectors?}
153message lvmlv_stripes_ask {Stripes?} 153message lvmlv_stripes_ask {Stripes?}
 154
 155message notsupported {Operation wird nicht unterstützt!}
 156message edit_parts {Partitionen bearbeiten}
 157message encrypt {Verschlüsseln (CGD)}
 158message erase {Safe Erase}
 159message undo {Rückgängigmachen von Änderungen}
 160message unconfig {Dekonfigurieren}
 161message edit {Bearbeiten}
 162message doumount {Force-umount}
 163
 164message switch_parts {Switch partitioning scheme}
 165message fmtasraid {Als RAID Komponente formatieren}
 166message fmtaslvm {Als LVM-PV formatieren}
 167

cvs diff -r1.2 -r1.3 src/usr.sbin/sysinst/msg.pm.en (expand / switch to unified diff)

--- src/usr.sbin/sysinst/msg.pm.en 2020/01/09 13:22:30 1.2
+++ src/usr.sbin/sysinst/msg.pm.en 2020/11/04 14:29:40 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: msg.pm.en,v 1.2 2020/01/09 13:22:30 martin Exp $ */ 1/* $NetBSD: msg.pm.en,v 1.3 2020/11/04 14:29:40 martin Exp $ */
2 2
3/* 3/*
4 * Copyright 1997 Piermont Information Systems Inc. 4 * Copyright 1997 Piermont Information Systems Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Written by Philip A. Nelson for Piermont Information Systems Inc. 7 * Written by Philip A. Nelson for Piermont Information Systems Inc.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -143,13 +143,26 @@ message lvmlv_pers_fmt {Persistent minor @@ -143,13 +143,26 @@ message lvmlv_pers_fmt {Persistent minor
143message lvmlv_readahsect_fmt {ReadAheadSectors} 143message lvmlv_readahsect_fmt {ReadAheadSectors}
144message lvmlv_stripes_fmt {Stripes} 144message lvmlv_stripes_fmt {Stripes}
145message lvmlv_stripesiz_fmt {StripeSize} 145message lvmlv_stripesiz_fmt {StripeSize}
146message lvmlv_zero_fmt {Zeroing of the first KB} 146message lvmlv_zero_fmt {Zeroing of the first KB}
147message lvmlv_name_ask {Name?} 147message lvmlv_name_ask {Name?}
148message lvmlv_size_ask {Size (MB)?} 148message lvmlv_size_ask {Size (MB)?}
149message lvmlv_extnum_ask {LogicalExtentsNumber?} 149message lvmlv_extnum_ask {LogicalExtentsNumber?}
150message lvmlv_minor_ask {Minor number?} 150message lvmlv_minor_ask {Minor number?}
151message lvmlv_mirrors_ask {Mirrors?} 151message lvmlv_mirrors_ask {Mirrors?}
152message lvmlv_regsiz_ask {MirrorLogRegionSize?} 152message lvmlv_regsiz_ask {MirrorLogRegionSize?}
153message lvmlv_readahsect_ask {ReadAheadSectors?} 153message lvmlv_readahsect_ask {ReadAheadSectors?}
154message lvmlv_stripes_ask {Stripes?} 154message lvmlv_stripes_ask {Stripes?}
155 155
 156message notsupported {Operation not supported!}
 157message edit_parts {Edit partitions}
 158message switch_parts {Switch partitioning scheme}
 159message fmtasraid {Format as RAID}
 160message fmtaslvm {Format as LVM PV}
 161message encrypt {Encrypt (CGD)}
 162message setbootable {Bootable flag}
 163message erase {Safe erase}
 164message undo {Undo changes}
 165message unconfig {Unconfigure}
 166message edit {Edit}
 167message doumount {Force umount}
 168

cvs diff -r1.2 -r1.3 src/usr.sbin/sysinst/msg.pm.es (expand / switch to unified diff)

--- src/usr.sbin/sysinst/msg.pm.es 2020/01/09 13:22:30 1.2
+++ src/usr.sbin/sysinst/msg.pm.es 2020/11/04 14:29:40 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: msg.pm.es,v 1.2 2020/01/09 13:22:30 martin Exp $ */ 1/* $NetBSD: msg.pm.es,v 1.3 2020/11/04 14:29:40 martin Exp $ */
2 2
3/* 3/*
4 * Copyright 1997 Piermont Information Systems Inc. 4 * Copyright 1997 Piermont Information Systems Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Written by Philip A. Nelson for Piermont Information Systems Inc. 7 * Written by Philip A. Nelson for Piermont Information Systems Inc.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -142,13 +142,26 @@ message lvmlv_pers_fmt {Número de persis @@ -142,13 +142,26 @@ message lvmlv_pers_fmt {Número de persis
142message lvmlv_readahsect_fmt {ReadAheadSectors} 142message lvmlv_readahsect_fmt {ReadAheadSectors}
143message lvmlv_stripes_fmt {Rayas} 143message lvmlv_stripes_fmt {Rayas}
144message lvmlv_stripesiz_fmt {Stripesize} 144message lvmlv_stripesiz_fmt {Stripesize}
145message lvmlv_zero_fmt {Puesta a cero de la primera KB} 145message lvmlv_zero_fmt {Puesta a cero de la primera KB}
146message lvmlv_name_ask {Nombre?} 146message lvmlv_name_ask {Nombre?}
147message lvmlv_size_ask {Tamaño (MB)?} 147message lvmlv_size_ask {Tamaño (MB)?}
148message lvmlv_extnum_ask {LogicalExtentsNumber?} 148message lvmlv_extnum_ask {LogicalExtentsNumber?}
149message lvmlv_minor_ask {Número menor de edad?} 149message lvmlv_minor_ask {Número menor de edad?}
150message lvmlv_mirrors_ask {Espejos?} 150message lvmlv_mirrors_ask {Espejos?}
151message lvmlv_regsiz_ask {MirrorLogRegionSize?} 151message lvmlv_regsiz_ask {MirrorLogRegionSize?}
152message lvmlv_readahsect_ask {ReadAheadSectors?} 152message lvmlv_readahsect_ask {ReadAheadSectors?}
153message lvmlv_stripes_ask {Rayas?} 153message lvmlv_stripes_ask {Rayas?}
154 154
 155message notsupported {Operación no admitida!}
 156message edit_parts {Editar particiones}
 157message switch_parts {Switch partitioning scheme}
 158message fmtasraid {Formato como RAID}
 159message fmtaslvm {Formato como LVM PV}
 160message encrypt {Cifrar (CGD)}
 161message setbootable {La bandera de arranque}
 162message erase {Borrado seguro}
 163message undo {Deshacer los cambios}
 164message unconfig {Desconfigurar}
 165message edit {Editar}
 166message doumount {Fuerza umount}
 167

cvs diff -r1.2 -r1.3 src/usr.sbin/sysinst/msg.pm.fr (expand / switch to unified diff)

--- src/usr.sbin/sysinst/msg.pm.fr 2020/01/09 13:22:30 1.2
+++ src/usr.sbin/sysinst/msg.pm.fr 2020/11/04 14:29:40 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: msg.pm.fr,v 1.2 2020/01/09 13:22:30 martin Exp $ */ 1/* $NetBSD: msg.pm.fr,v 1.3 2020/11/04 14:29:40 martin Exp $ */
2 2
3/* 3/*
4 * Copyright 1997 Piermont Information Systems Inc. 4 * Copyright 1997 Piermont Information Systems Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Written by Philip A. Nelson for Piermont Information Systems Inc. 7 * Written by Philip A. Nelson for Piermont Information Systems Inc.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -142,13 +142,26 @@ message lvmlv_pers_fmt {Persistante numé @@ -142,13 +142,26 @@ message lvmlv_pers_fmt {Persistante numé
142message lvmlv_readahsect_fmt {ReadAheadSectors} 142message lvmlv_readahsect_fmt {ReadAheadSectors}
143message lvmlv_stripes_fmt {Rayures} 143message lvmlv_stripes_fmt {Rayures}
144message lvmlv_stripesiz_fmt {Stripesize} 144message lvmlv_stripesiz_fmt {Stripesize}
145message lvmlv_zero_fmt {Remise à zéro de la KB d'abord} 145message lvmlv_zero_fmt {Remise à zéro de la KB d'abord}
146message lvmlv_name_ask {Nom?} 146message lvmlv_name_ask {Nom?}
147message lvmlv_size_ask {Taille (MB)?} 147message lvmlv_size_ask {Taille (MB)?}
148message lvmlv_extnum_ask {LogicalExtentsNumber?} 148message lvmlv_extnum_ask {LogicalExtentsNumber?}
149message lvmlv_minor_ask {Numéro mineur?} 149message lvmlv_minor_ask {Numéro mineur?}
150message lvmlv_mirrors_ask {Miroirs?} 150message lvmlv_mirrors_ask {Miroirs?}
151message lvmlv_regsiz_ask {MirrorLogRegionSize?} 151message lvmlv_regsiz_ask {MirrorLogRegionSize?}
152message lvmlv_readahsect_ask {ReadAheadSectors?} 152message lvmlv_readahsect_ask {ReadAheadSectors?}
153message lvmlv_stripes_ask {Stripes?} 153message lvmlv_stripes_ask {Stripes?}
154 154
 155message notsupported {Le fonctionnement n'est pas pris en charge!}
 156message edit_parts {Modifier les partitions}
 157message switch_parts {Switch partitioning scheme}
 158message fmtasraid {Format en RAID}
 159message fmtaslvm {Format de LVM PV}
 160message encrypt {Crypter (CGD)}
 161message setbootable {Drapeau d'amorçage}
 162message erase {Fonction d'effacement sécurisé}
 163message undo {Annuler les changements}
 164message unconfig {Annulation de la configuration}
 165message edit {Éditer}
 166message doumount {Groupe umount}
 167

cvs diff -r1.2 -r1.3 src/usr.sbin/sysinst/msg.pm.pl (expand / switch to unified diff)

--- src/usr.sbin/sysinst/msg.pm.pl 2020/01/09 13:22:30 1.2
+++ src/usr.sbin/sysinst/msg.pm.pl 2020/11/04 14:29:40 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: msg.pm.pl,v 1.2 2020/01/09 13:22:30 martin Exp $ */ 1/* $NetBSD: msg.pm.pl,v 1.3 2020/11/04 14:29:40 martin Exp $ */
2 2
3/* 3/*
4 * Copyright 1997 Piermont Information Systems Inc. 4 * Copyright 1997 Piermont Information Systems Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Written by Philip A. Nelson for Piermont Information Systems Inc. 7 * Written by Philip A. Nelson for Piermont Information Systems Inc.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -142,13 +142,26 @@ message lvmlv_pers_fmt {Trwa³e drobne nu @@ -142,13 +142,26 @@ message lvmlv_pers_fmt {Trwa³e drobne nu
142message lvmlv_readahsect_fmt {ReadAheadSectors ceny} 142message lvmlv_readahsect_fmt {ReadAheadSectors ceny}
143message lvmlv_stripes_fmt {Stripes} 143message lvmlv_stripes_fmt {Stripes}
144message lvmlv_stripesiz_fmt {StripeSize} 144message lvmlv_stripesiz_fmt {StripeSize}
145message lvmlv_zero_fmt {Zerowanie pierwszej KB} 145message lvmlv_zero_fmt {Zerowanie pierwszej KB}
146message lvmlv_name_ask {Nazwa?} 146message lvmlv_name_ask {Nazwa?}
147message lvmlv_size_ask {Rozmiar (MB)?} 147message lvmlv_size_ask {Rozmiar (MB)?}
148message lvmlv_extnum_ask {LogicalExtentsNumber?} 148message lvmlv_extnum_ask {LogicalExtentsNumber?}
149message lvmlv_minor_ask {Mniejsza liczba?} 149message lvmlv_minor_ask {Mniejsza liczba?}
150message lvmlv_mirrors_ask {Mirrors?} 150message lvmlv_mirrors_ask {Mirrors?}
151message lvmlv_regsiz_ask {MirrorLogRegionSize?} 151message lvmlv_regsiz_ask {MirrorLogRegionSize?}
152message lvmlv_readahsect_ask {ReadAheadSectors?} 152message lvmlv_readahsect_ask {ReadAheadSectors?}
153message lvmlv_stripes_ask {Stripes?} 153message lvmlv_stripes_ask {Stripes?}
154 154
 155message notsupported {Operacja nie jest obslugiwana!}
 156message edit_parts {Edytuj partycje}
 157message switch_parts {Switch partitioning scheme}
 158message fmtasraid {Formatuj jako RAID}
 159message fmtaslvm {Formatuj jak LVM PV}
 160message encrypt {Szyfrowanie (CGD)}
 161message setbootable {Rozruchowy}
 162message erase {Bezpieczne kasowanie}
 163message undo {Cofanie zmian}
 164message unconfig {Cofnij konfiguracje}
 165message edit {Edytuj}
 166message doumount {Wymus odmontowanie}
 167

cvs diff -r1.16 -r1.17 src/usr.sbin/sysinst/upgrade.c (expand / switch to unified diff)

--- src/usr.sbin/sysinst/upgrade.c 2020/02/06 19:50:04 1.16
+++ src/usr.sbin/sysinst/upgrade.c 2020/11/04 14:29:40 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: upgrade.c,v 1.16 2020/02/06 19:50:04 martin Exp $ */ 1/* $NetBSD: upgrade.c,v 1.17 2020/11/04 14:29:40 martin Exp $ */
2 2
3/* 3/*
4 * Copyright 1997 Piermont Information Systems Inc. 4 * Copyright 1997 Piermont Information Systems Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Written by Philip A. Nelson for Piermont Information Systems Inc. 7 * Written by Philip A. Nelson for Piermont Information Systems Inc.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -94,27 +94,26 @@ do_upgrade(void) @@ -94,27 +94,26 @@ do_upgrade(void)
94 /* 94 /*
95 * Save X symlink, ... 95 * Save X symlink, ...
96 */ 96 */
97 if (save_X("/usr/X11R6")) 97 if (save_X("/usr/X11R6"))
98 goto free_install; 98 goto free_install;
99 if (save_X("/usr/X11R7")) 99 if (save_X("/usr/X11R7"))
100 goto free_install; 100 goto free_install;
101 101
102#ifdef AOUT2ELF 102#ifdef AOUT2ELF
103 move_aout_libs(); 103 move_aout_libs();
104#endif 104#endif
105 /* Do any md updating of the file systems ... e.g. bootblocks, 105 /* Do any md updating of the file systems ... e.g. bootblocks,
106 copy file systems ... */ 106 copy file systems ... */
107 /* XXX pass install here too */ 
108 if (!md_update(&install)) 107 if (!md_update(&install))
109 goto free_install; 108 goto free_install;
110 109
111 wrefresh(curscr); 110 wrefresh(curscr);
112 wmove(stdscr, 0, 0); 111 wmove(stdscr, 0, 0);
113 wclear(stdscr); 112 wclear(stdscr);
114 wrefresh(stdscr); 113 wrefresh(stdscr);
115 114
116 /* Done with disks. Ready to get and unpack tarballs. */ 115 /* Done with disks. Ready to get and unpack tarballs. */
117 process_menu(MENU_distset, &retcode); 116 process_menu(MENU_distset, &retcode);
118 if (retcode == 0) 117 if (retcode == 0)
119 goto free_install; 118 goto free_install;
120 if (get_and_unpack_sets(1, MSG_disksetupdoneupdate, 119 if (get_and_unpack_sets(1, MSG_disksetupdoneupdate,

cvs diff -r1.53 -r1.54 src/usr.sbin/sysinst/util.c (expand / switch to unified diff)

--- src/usr.sbin/sysinst/util.c 2020/10/30 18:47:38 1.53
+++ src/usr.sbin/sysinst/util.c 2020/11/04 14:29:40 1.54
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: util.c,v 1.53 2020/10/30 18:47:38 martin Exp $ */ 1/* $NetBSD: util.c,v 1.54 2020/11/04 14:29:40 martin Exp $ */
2 2
3/* 3/*
4 * Copyright 1997 Piermont Information Systems Inc. 4 * Copyright 1997 Piermont Information Systems Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Written by Philip A. Nelson for Piermont Information Systems Inc. 7 * Written by Philip A. Nelson for Piermont Information Systems Inc.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -52,26 +52,30 @@ @@ -52,26 +52,30 @@
52#include <curses.h> 52#include <curses.h>
53#include <err.h> 53#include <err.h>
54#include <errno.h> 54#include <errno.h>
55#include <dirent.h> 55#include <dirent.h>
56#include <util.h> 56#include <util.h>
57#include "defs.h" 57#include "defs.h"
58#include "md.h" 58#include "md.h"
59#include "defsizes.h" 59#include "defsizes.h"
60#include "msg_defs.h" 60#include "msg_defs.h"
61#include "menu_defs.h" 61#include "menu_defs.h"
62#ifdef MD_MAY_SWAP_TO 62#ifdef MD_MAY_SWAP_TO
63#include <sys/drvctlio.h> 63#include <sys/drvctlio.h>
64#endif 64#endif
 65#ifdef CHECK_ENTROPY
 66#include <sha2.h>
 67#include <paths.h>
 68#endif
65 69
66#define MAX_CD_DEVS 256 /* how many cd drives do we expect to attach */ 70#define MAX_CD_DEVS 256 /* how many cd drives do we expect to attach */
67#define ISO_BLKSIZE ISO_DEFAULT_BLOCK_SIZE 71#define ISO_BLKSIZE ISO_DEFAULT_BLOCK_SIZE
68 72
69static const char *msg_yes, *msg_no, *msg_all, *msg_some, *msg_none; 73static const char *msg_yes, *msg_no, *msg_all, *msg_some, *msg_none;
70static int select_menu_width; 74static int select_menu_width;
71 75
72static uint8_t set_status[SET_GROUP_END]; 76static uint8_t set_status[SET_GROUP_END];
73#define SET_VALID 0x01 77#define SET_VALID 0x01
74#define SET_SELECTED 0x02 78#define SET_SELECTED 0x02
75#define SET_SKIPPED 0x04 79#define SET_SKIPPED 0x04
76#define SET_INSTALLED 0x08 80#define SET_INSTALLED 0x08
77#define SET_NO_EXTRACT 0x10 81#define SET_NO_EXTRACT 0x10
@@ -1097,26 +1101,291 @@ get_set_distinfo(int opt) @@ -1097,26 +1101,291 @@ get_set_distinfo(int opt)
1097 if (set != opt) 1101 if (set != opt)
1098 continue; 1102 continue;
1099 if (dist->name == NULL) 1103 if (dist->name == NULL)
1100 continue; 1104 continue;
1101 if ((set_status[set] & (SET_VALID | SET_SELECTED)) 1105 if ((set_status[set] & (SET_VALID | SET_SELECTED))
1102 != (SET_VALID | SET_SELECTED)) 1106 != (SET_VALID | SET_SELECTED))
1103 continue; 1107 continue;
1104 return dist; 1108 return dist;
1105 } 1109 }
1106 1110
1107 return NULL; 1111 return NULL;
1108} 1112}
1109 1113
 1114#ifdef CHECK_ENTROPY
 1115
 1116char entropy_file[PATH_MAX];
 1117
 1118/*
 1119 * Are we short of entropy?
 1120 */
 1121static size_t
 1122entropy_needed(void)
 1123{
 1124 int needed;
 1125 size_t len;
 1126
 1127 len = sizeof(needed);
 1128 if (sysctlbyname("kern.entropy.needed", &needed, &len, NULL, 0))
 1129 return 0;
 1130
 1131 if (needed < 0)
 1132 return 0;
 1133
 1134 return needed;
 1135}
 1136
 1137static void
 1138entropy_write_to_kernel(const uint8_t *data, size_t len)
 1139{
 1140 int fd;
 1141
 1142 fd = open(_PATH_RANDOM, O_RDWR, 0);
 1143 if (fd >= 0) {
 1144 write(fd, data, len);
 1145 close(fd);
 1146 }
 1147}
 1148
 1149static void
 1150entropy_add_manual(void)
 1151{
 1152 SHA256_CTX ctx;
 1153 char buf[256], line[25];
 1154 size_t line_no, l;
 1155 uint8_t digest[SHA256_DIGEST_LENGTH];
 1156 bool ok = false;
 1157
 1158 msg_display(MSG_entropy_enter_manual1);
 1159 msg_printf("\n\n");
 1160 msg_display_add(MSG_entropy_enter_manual2);
 1161 msg_printf("\n\n dd if=/dev/random bs=32 count=16 | openssl base64\n\n");
 1162 msg_display_add(MSG_entropy_enter_manual3);
 1163 msg_printf("\n\n");
 1164 SHA256_Init(&ctx);
 1165 line_no = 1;
 1166 do {
 1167 sprintf(line, "%zu", line_no);
 1168 msg_prompt_win(line, -1, 15, 0, 0, "", buf, sizeof(buf));
 1169 l = strlen(buf);
 1170 if (l > 0)
 1171 SHA256_Update(&ctx, (const uint8_t*)buf, l);
 1172 line_no++;
 1173 } while(buf[0] != 0);
 1174 ok = ctx.bitcount >= 256;
 1175 SHA256_Final(digest, &ctx);
 1176
 1177 if (ok)
 1178 entropy_write_to_kernel(digest, sizeof digest);
 1179 else
 1180 hit_enter_to_continue(NULL, MSG_entropy_manual_not_enough);
 1181}
 1182
 1183/*
 1184 * Get a file by some means and return a (potentioally only
 1185 * temporary valid) path to the local copy.
 1186 * If mountpt is non empty, the caller should unmount that
 1187 * directory after processing the file.
 1188 * Return success if the file is available, or failure if
 1189 * the user canelled the request or network transfer failed.
 1190 */
 1191static bool
 1192entropy_get_file(bool use_netbsd_seed, char *path)
 1193{
 1194 static struct ftpinfo server = { .user = "ftp" };
 1195 char url[STRSIZE], tmpf[PATH_MAX], mountpt[PATH_MAX], *fn;
 1196 const char *ftp_opt;
 1197 arg_rv arg;
 1198 int rv = 0;
 1199 const char *file_desc = msg_string(use_netbsd_seed ?
 1200 MSG_entropy_seed : MSG_entropy_data);
 1201 char *dir;
 1202
 1203 path[0] = 0;
 1204 mountpt[0] = 0;
 1205
 1206 strcpy(tmpf, "/tmp/entr.XXXXXX");
 1207 fn = mktemp(tmpf);
 1208 if (fn == NULL)
 1209 return false;
 1210
 1211 msg_display(use_netbsd_seed ?
 1212 MSG_entropy_seed_hdr : MSG_entropy_data_hdr);
 1213 msg_printf("\n\n %s\n\n",
 1214 use_netbsd_seed ?
 1215 "rndctl -S /tmp/entropy-file" :
 1216 "dd if=/dev/random bs=32 count=1 of=/tmp/random.tmp");
 1217 strcpy(entropy_file, use_netbsd_seed ?
 1218 "entropy-file" : "random.tmp");
 1219 process_menu(MENU_entropy_select_file, &rv);
 1220 switch (rv) {
 1221 case 1:
 1222 case 2:
 1223#ifndef DEBUG
 1224 if (!network_up)
 1225 config_network();
 1226#endif
 1227 server.xfer = rv == 1 ? XFER_HTTP : XFER_FTP;
 1228 arg.arg = &server;
 1229 arg.rv = -1;
 1230 msg_display_add_subst(MSG_entropy_via_download, 1, file_desc);
 1231 msg_printf("\n\n");
 1232 process_menu(MENU_entropy_ftpsource, &arg);
 1233 if (arg.rv == SET_RETRY)
 1234 return false;
 1235 make_url(url, &server, entropy_file);
 1236 if (server.xfer == XFER_FTP &&
 1237 strcmp("ftp", server.user) == 0 && server.pass[0] == 0) {
 1238 /* do anon ftp */
 1239 ftp_opt = "-a ";
 1240 } else {
 1241 ftp_opt = "";
 1242 }
 1243 rv = run_program(RUN_DISPLAY | RUN_PROGRESS,
 1244 "/usr/bin/ftp %s -o %s %s",
 1245 ftp_opt, fn, url);
 1246 strcpy(path, fn);
 1247 return rv == 0;
 1248 case 3:
 1249#ifndef DEBUG
 1250 if (!network_up)
 1251 config_network();
 1252#endif
 1253 rv = -1;
 1254 msg_display_add_subst(MSG_entropy_via_nfs, 1, file_desc);
 1255 msg_printf("\n\n");
 1256 process_menu(MENU_entropy_nfssource, &rv);
 1257 if (rv == SET_RETRY)
 1258 return false;
 1259 if (nfs_host[0] != 0 && nfs_dir[0] != 0 &&
 1260 entropy_file[0] != 0) {
 1261 strcpy(mountpt, "/tmp/ent-mnt.XXXXXX");
 1262 dir = mkdtemp(mountpt);
 1263 if (dir == NULL)
 1264 return false;
 1265 sprintf(path, "%s/%s", mountpt, entropy_file);
 1266 if (run_program(RUN_SILENT,
 1267 "mount -t nfs -r %s:/%s %s",
 1268 nfs_host, nfs_dir, mountpt) == 0) {
 1269 run_program(RUN_SILENT,
 1270 "cp %s %s", path, fn);
 1271 run_program(RUN_SILENT,
 1272 "umount %s", mountpt);
 1273 rmdir(mountpt);
 1274 strcpy(path, fn);
 1275 }
 1276 }
 1277 break;
 1278 case 4:
 1279 rv = -1;
 1280 /* Get device, filesystem, and filepath */
 1281 process_menu (MENU_entropy_localfs, &rv);
 1282 if (rv == SET_RETRY)
 1283 return false;
 1284 if (localfs_dev[0] != 0 && localfs_fs[0] != 0 &&
 1285 entropy_file[0] != 0) {
 1286 strcpy(mountpt, "/tmp/ent-mnt.XXXXXX");
 1287 dir = mkdtemp(mountpt);
 1288 if (dir == NULL)
 1289 return false;
 1290 sprintf(path, "%s/%s", mountpt, entropy_file);
 1291 if (run_program(RUN_SILENT,
 1292 "mount -t %s -r /dev/%s %s",
 1293 localfs_fs, localfs_dev, mountpt) == 0) {
 1294 run_program(RUN_SILENT,
 1295 "cp %s %s", path, fn);
 1296 run_program(RUN_SILENT,
 1297 "umount %s", mountpt);
 1298 rmdir(mountpt);
 1299 strcpy(path, fn);
 1300 }
 1301 }
 1302 break;
 1303 }
 1304 return path[0] != 0;
 1305}
 1306
 1307static void
 1308entropy_add_bin_file(void)
 1309{
 1310 char fname[PATH_MAX];
 1311
 1312 if (!entropy_get_file(false, fname))
 1313 return;
 1314 if (access(fname, R_OK) == 0)
 1315 run_program(RUN_SILENT, "dd if=%s of=" _PATH_RANDOM,
 1316 fname);
 1317}
 1318
 1319static void
 1320entropy_add_seed(void)
 1321{
 1322 char fname[PATH_MAX];
 1323
 1324 if (!entropy_get_file(true, fname))
 1325 return;
 1326 if (access(fname, R_OK) == 0)
 1327 run_program(RUN_SILENT, "rndctl -L %s", fname);
 1328}
 1329
 1330/*
 1331 * return true if we have enough entropy
 1332 */
 1333bool
 1334do_check_entropy(void)
 1335{
 1336 int rv;
 1337
 1338 if (entropy_needed() == 0)
 1339 return true;
 1340
 1341 for (;;) {
 1342 if (entropy_needed() == 0)
 1343 return true;
 1344
 1345 msg_clear();
 1346 rv = 0;
 1347 process_menu(MENU_not_enough_entropy, &rv);
 1348 switch (rv) {
 1349 case 0:
 1350 return false;
 1351 case 1:
 1352 entropy_add_manual();
 1353 break;
 1354 case 2:
 1355 entropy_add_seed();
 1356 break;
 1357 case 3:
 1358 entropy_add_bin_file();
 1359 break;
 1360 default:
 1361 /*
 1362 * retry after small delay to give a new USB device
 1363 * a chance to attach and do deliver some
 1364 * entropy
 1365 */
 1366 msg_display(".");
 1367 for (size_t i = 0; i < 10; i++) {
 1368 if (entropy_needed() == 0)
 1369 return true;
 1370 sleep(1);
 1371 msg_display_add(".");
 1372 }
 1373 }
 1374 }
 1375}
 1376#endif
 1377
 1378
1110 1379
1111/* 1380/*
1112 * Get and unpack the distribution. 1381 * Get and unpack the distribution.
1113 * Show success_msg if installation completes. 1382 * Show success_msg if installation completes.
1114 * Otherwise show failure_msg and wait for the user to ack it before continuing. 1383 * Otherwise show failure_msg and wait for the user to ack it before continuing.
1115 * success_msg and failure_msg must both be 0-adic messages. 1384 * success_msg and failure_msg must both be 0-adic messages.
1116 */ 1385 */
1117int 1386int
1118get_and_unpack_sets(int update, msg setupdone_msg, msg success_msg, msg failure_msg) 1387get_and_unpack_sets(int update, msg setupdone_msg, msg success_msg, msg failure_msg)
1119{ 1388{
1120 distinfo *dist; 1389 distinfo *dist;
1121 int status; 1390 int status;
1122 int set, olderror, oldfound; 1391 int set, olderror, oldfound;
@@ -1236,27 +1505,34 @@ get_and_unpack_sets(int update, msg setu @@ -1236,27 +1505,34 @@ get_and_unpack_sets(int update, msg setu
1236 run_program(RUN_DISPLAY | RUN_CHROOT, 1505 run_program(RUN_DISPLAY | RUN_CHROOT,
1237 "/usr/sbin/postinstall -s /.sysinst -d / fix"); 1506 "/usr/sbin/postinstall -s /.sysinst -d / fix");
1238 1507
1239 /* Don't discard the system's old entropy if any */ 1508 /* Don't discard the system's old entropy if any */
1240 run_program(RUN_CHROOT | RUN_SILENT, 1509 run_program(RUN_CHROOT | RUN_SILENT,
1241 "/etc/rc.d/random_seed start"); 1510 "/etc/rc.d/random_seed start");
1242 entropy_loaded = true; 1511 entropy_loaded = true;
1243 } 1512 }
1244 1513
1245 /* Configure the system */ 1514 /* Configure the system */
1246 if (set_status[SET_BASE] & SET_INSTALLED) 1515 if (set_status[SET_BASE] & SET_INSTALLED)
1247 run_makedev(); 1516 run_makedev();
1248 1517
1249 if (!update) { 1518 if (update) {
 1519#ifdef CHECK_ENTROPY
 1520 if (!do_check_entropy()) {
 1521 hit_enter_to_continue(NULL, MSG_abortupgr);
 1522 return 1;
 1523 }
 1524#endif
 1525 } else {
1250 struct stat sb1, sb2; 1526 struct stat sb1, sb2;
1251 1527
1252 if (stat(target_expand("/"), &sb1) == 0 1528 if (stat(target_expand("/"), &sb1) == 0
1253 && stat(target_expand("/var"), &sb2) == 0 1529 && stat(target_expand("/var"), &sb2) == 0
1254 && sb1.st_dev != sb2.st_dev) { 1530 && sb1.st_dev != sb2.st_dev) {
1255 add_rc_conf("random_file=/etc/entropy-file\n"); 1531 add_rc_conf("random_file=/etc/entropy-file\n");
1256 if (target_file_exists_p("/boot.cfg")) { 1532 if (target_file_exists_p("/boot.cfg")) {
1257 run_program(RUN_CHROOT|RUN_FATAL, 1533 run_program(RUN_CHROOT|RUN_FATAL,
1258 "sh -c 'sed -e s./var/db/./etc/. " 1534 "sh -c 'sed -e s./var/db/./etc/. "
1259 "< /boot.cfg " 1535 "< /boot.cfg "
1260 "> /tmp/boot.cfg.tmp'"); 1536 "> /tmp/boot.cfg.tmp'");
1261 mv_within_target_or_die("/tmp/boot.cfg.tmp", 1537 mv_within_target_or_die("/tmp/boot.cfg.tmp",
1262 "/boot.cfg"); 1538 "/boot.cfg");
@@ -1270,26 +1546,30 @@ get_and_unpack_sets(int update, msg setu @@ -1270,26 +1546,30 @@ get_and_unpack_sets(int update, msg setu
1270 } 1546 }
1271#endif 1547#endif
1272 1548
1273 /* Save keyboard type */ 1549 /* Save keyboard type */
1274 save_kb_encoding(); 1550 save_kb_encoding();
1275 1551
1276 /* Other configuration. */ 1552 /* Other configuration. */
1277 mnt_net_config(); 1553 mnt_net_config();
1278 } 1554 }
1279 1555
1280 /* Mounted dist dir? */ 1556 /* Mounted dist dir? */
1281 umount_mnt2(); 1557 umount_mnt2();
1282 1558
 1559#ifdef CHECK_ENTROPY
 1560 entropy_loaded |= entropy_needed() == 0;
 1561#endif
 1562
1283 /* Save entropy -- on some systems it's ~all we'll ever get */ 1563 /* Save entropy -- on some systems it's ~all we'll ever get */
1284 if (!update || entropy_loaded) 1564 if (!update || entropy_loaded)
1285 run_program(RUN_SILENT | RUN_CHROOT | RUN_ERROR_OK, 1565 run_program(RUN_SILENT | RUN_CHROOT | RUN_ERROR_OK,
1286 "/etc/rc.d/random_seed stop"); 1566 "/etc/rc.d/random_seed stop");
1287 /* Install/Upgrade complete ... reboot or exit to script */ 1567 /* Install/Upgrade complete ... reboot or exit to script */
1288 hit_enter_to_continue(success_msg, NULL); 1568 hit_enter_to_continue(success_msg, NULL);
1289 return 0; 1569 return 0;
1290} 1570}
1291 1571
1292void 1572void
1293umount_mnt2(void) 1573umount_mnt2(void)
1294{ 1574{
1295 if (!mnt2_mounted) 1575 if (!mnt2_mounted)

cvs diff -r1.4 -r1.5 src/usr.sbin/sysinst/arch/atari/Makefile (expand / switch to unified diff)

--- src/usr.sbin/sysinst/arch/atari/Makefile 2019/06/12 06:20:18 1.4
+++ src/usr.sbin/sysinst/arch/atari/Makefile 2020/11/04 14:29:40 1.5
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.4 2019/06/12 06:20:18 martin Exp $ 1# $NetBSD: Makefile,v 1.5 2020/11/04 14:29:40 martin Exp $
2# 2#
3# Makefile for atari 3# Makefile for atari
4# 4#
5 5
6#MD_OPTIONS= AOUT2ELF 6#MD_OPTIONS= AOUT2ELF
7LANGUAGES= en de 7LANGUAGES= en de
8 8
9CPPFLAGS+= -DSUPPORT_8_3_SOURCE_FILESYSTEM 9CPPFLAGS+= -DSUPPORT_8_3_SOURCE_FILESYSTEM
10 10
11.ifdef SMALLPROG 11.ifdef SMALLPROG
 12CHECK_ENTROPY= no # do not check entropy/offer adding
12NOPARTMAN= yes 13NOPARTMAN= yes
13NO_GPT= yes 14NO_GPT= yes
14.endif 15.endif
15 16
16.include "../../Makefile.inc" 17.include "../../Makefile.inc"

cvs diff -r1.3 -r1.4 src/usr.sbin/sysinst/arch/ews4800mips/Makefile (expand / switch to unified diff)

--- src/usr.sbin/sysinst/arch/ews4800mips/Makefile 2019/11/13 18:58:09 1.3
+++ src/usr.sbin/sysinst/arch/ews4800mips/Makefile 2020/11/04 14:29:40 1.4
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1# $NetBSD: Makefile,v 1.3 2019/11/13 18:58:09 martin Exp $ 1# $NetBSD: Makefile,v 1.4 2020/11/04 14:29:40 martin Exp $
2# 2#
3# Makefile for ews4800mips 3# Makefile for ews4800mips
4# 4#
5 5
6LANGUAGES= # no translations 6LANGUAGES= # no translations
7 7
8.ifdef SMALLPROG 8.ifdef SMALLPROG
 9CHECK_ENTROPY= no # do not check entropy/offer adding
9NOPARTMAN= yes 10NOPARTMAN= yes
10NO_GPT= yes 11NO_GPT= yes
11NO_MBR= yes 12NO_MBR= yes
12NO_CLONES= yes 13NO_CLONES= yes
13.endif 14.endif
14 15
15.include "../../Makefile.inc" 16.include "../../Makefile.inc"