Module Name: src
Committed By: tls
Date: Fri Dec 9 06:50:36 UTC 2011
Modified Files:
src/etc/etc.amd64: boot.cfg
src/etc/etc.i386: boot.cfg
Log Message:
Use random seed file (saved entropy) from default location by default
in i386 and amd64 boot.cfg.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/etc/etc.amd64/boot.cfg
cvs rdiff -u -r1.2 -r1.3 src/etc/etc.i386/boot.cfg
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.amd64/boot.cfg
diff -u src/etc/etc.amd64/boot.cfg:1.2 src/etc/etc.amd64/boot.cfg:1.3
--- src/etc/etc.amd64/boot.cfg:1.2 Sat Dec 13 23:30:03 2008
+++ src/etc/etc.amd64/boot.cfg Fri Dec 9 06:50:36 2011
@@ -1,8 +1,8 @@
-menu=Boot normally:boot netbsd
-menu=Boot single user:boot netbsd -s
-menu=Disable ACPI:boot netbsd -2
-menu=Disable ACPI and SMP:boot netbsd -12
-menu=Drop to boot prompt:prompt
+menu=Boot normally:rndseed /var/db/entropy-file;boot netbsd
+menu=Boot single user:rndseed /var/db/entropy-file;boot netbsd -s
+menu=Disable ACPI:rndseed /var/db/entropy-file;boot netbsd -2
+menu=Disable ACPI and SMP:rndseed /var/db/entropy-file;boot netbsd -12
+menu=Drop to boot prompt:rndseed /var/db/entropy-file;prompt
default=1
timeout=5
clear=1
Index: src/etc/etc.i386/boot.cfg
diff -u src/etc/etc.i386/boot.cfg:1.2 src/etc/etc.i386/boot.cfg:1.3
--- src/etc/etc.i386/boot.cfg:1.2 Sat Dec 13 23:30:03 2008
+++ src/etc/etc.i386/boot.cfg Fri Dec 9 06:50:36 2011
@@ -1,8 +1,8 @@
-menu=Boot normally:boot netbsd
-menu=Boot single user:boot netbsd -s
-menu=Disable ACPI:boot netbsd -2
-menu=Disable ACPI and SMP:boot netbsd -12
-menu=Drop to boot prompt:prompt
+menu=Boot normally:rndseed /var/db/entropy-file;boot netbsd
+menu=Boot single user:rndseed /var/db/entropy-file;boot netbsd -s
+menu=Disable ACPI:rndseed /var/db/entropy-file;boot netbsd -2
+menu=Disable ACPI and SMP:rndseed /var/db/entropy-file;boot netbsd -12
+menu=Drop to boot prompt:rndseed /var/db/entropy-file;prompt
default=1
timeout=5
clear=1
