Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ooops, backout previous - twice the entropy saving is not needed.

Browse Source 
Instead slightly improve the (slightly) hidden other code that already
did it.
This commit is contained in:
martin 2020-05-12 17:04:00 +00:00
parent a55d2d6bdf
commit 0466f2885f
3 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.sbin/sysinst/defs.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: defs.h,v 1.59 2020/05/12 16:18:04 martin Exp $ */
/* $NetBSD: defs.h,v 1.60 2020/05/12 17:04:00 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -809,7 +809,6 @@ 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);

4
usr.sbin/sysinst/install.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: install.c,v 1.15 2020/05/12 16:18:04 martin Exp $ */
/* $NetBSD: install.c,v 1.16 2020/05/12 17:04:00 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -229,8 +229,6 @@ do_install(void)
sanity_check();
save_entropy();
md_cleanup_install(&install);
hit_enter_to_continue(MSG_instcomplete, NULL);

24
usr.sbin/sysinst/util.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: util.c,v 1.43 2020/05/12 16:18:04 martin Exp $ */
/* $NetBSD: util.c,v 1.44 2020/05/12 17:04:00 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -1086,6 +1086,7 @@ get_and_unpack_sets(int update, msg setupdone_msg, msg success_msg, msg failure_
distinfo *dist;
int status;
int set, olderror, oldfound;
bool entropy_loaded = false;
/* Ensure mountpoint for distribution files exists in current root. */
(void)mkdir("/mnt2", S_IRWXU| S_IRGRP|S_IXGRP | S_IROTH|S_IXOTH);
@ -1203,7 +1204,8 @@ get_and_unpack_sets(int update, msg setupdone_msg, msg success_msg, msg failure_
/* Don't discard the system's old entropy if any */
run_program(RUN_CHROOT | RUN_SILENT,
"/etc/rc.d/random_seed start");
"/etc/rc.d/random_seed start");
entropy_loaded = true;
}
/* Configure the system */
@ -1245,7 +1247,8 @@ get_and_unpack_sets(int update, msg setupdone_msg, msg success_msg, msg failure_
umount_mnt2();
/* Save entropy -- on some systems it's ~all we'll ever get */
run_program(RUN_DISPLAY | RUN_CHROOT | RUN_FATAL | RUN_PROGRESS,
if (!update || entropy_loaded)
run_program(RUN_SILENT | RUN_CHROOT | RUN_ERROR_OK,
"/etc/rc.d/random_seed stop");
/* Install/Upgrade complete ... reboot or exit to script */
hit_enter_to_continue(success_msg, NULL);
@ -2199,21 +2202,6 @@ free_install_desc(struct install_partition_desc *install)
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)