Module Name: src
Committed By: martin
Date: Tue May 12 16:18:04 UTC 2020
Modified Files:
src/usr.sbin/sysinst: defs.h install.c util.c
Log Message:
At the end of a new installation save entropy.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/usr.sbin/sysinst/defs.h
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/sysinst/install.c
cvs rdiff -u -r1.42 -r1.43 src/usr.sbin/sysinst/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/defs.h
diff -u src/usr.sbin/sysinst/defs.h:1.58 src/usr.sbin/sysinst/defs.h:1.59
--- src/usr.sbin/sysinst/defs.h:1.58 Wed Apr 22 23:43:12 2020
+++ src/usr.sbin/sysinst/defs.h Tue May 12 16:18:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.58 2020/04/22 23:43:12 joerg Exp $ */
+/* $NetBSD: defs.h,v 1.59 2020/05/12 16:18:04 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -809,6 +809,7 @@ unsigned int get_kernel_set(void);
unsigned int set_X11_selected(void);
int get_and_unpack_sets(int, msg, msg, msg);
int sanity_check(void);
+void save_entropy(void);
int set_timezone(void);
void scripting_fprintf(FILE *, const char *, ...) __printflike(2, 3);
void scripting_vfprintf(FILE *, const char *, va_list) __printflike(2, 0);
Index: src/usr.sbin/sysinst/install.c
diff -u src/usr.sbin/sysinst/install.c:1.14 src/usr.sbin/sysinst/install.c:1.15
--- src/usr.sbin/sysinst/install.c:1.14 Thu Jan 16 13:56:24 2020
+++ src/usr.sbin/sysinst/install.c Tue May 12 16:18:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: install.c,v 1.14 2020/01/16 13:56:24 martin Exp $ */
+/* $NetBSD: install.c,v 1.15 2020/05/12 16:18:04 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -229,6 +229,8 @@ do_install(void)
sanity_check();
+ save_entropy();
+
md_cleanup_install(&install);
hit_enter_to_continue(MSG_instcomplete, NULL);
Index: src/usr.sbin/sysinst/util.c
diff -u src/usr.sbin/sysinst/util.c:1.42 src/usr.sbin/sysinst/util.c:1.43
--- src/usr.sbin/sysinst/util.c:1.42 Sun Jan 26 14:37:29 2020
+++ src/usr.sbin/sysinst/util.c Tue May 12 16:18:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.42 2020/01/26 14:37:29 martin Exp $ */
+/* $NetBSD: util.c,v 1.43 2020/05/12 16:18:04 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -2199,6 +2199,21 @@ free_install_desc(struct install_partiti
free(install->infos);
}
+/*
+ * Called while at the end of install when targetroot is still mounted
+ * and writable
+ */
+void
+save_entropy(void)
+{
+
+ if (!binary_available("rndctl"))
+ return;
+
+ run_program(RUN_SILENT|RUN_ERROR_OK, "rndctl -S %s",
+ target_expand("/var/db/entropy-file"));
+}
+
#ifdef MD_MAY_SWAP_TO
bool
may_swap_if_not_sdmmc(const char *disk)
