summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorforsyth <forsyth@vitanuova.com>2010-02-26 11:31:21 +0000
committerforsyth <forsyth@vitanuova.com>2010-02-26 11:31:21 +0000
commitebcf8d9b30a1bc12ed7da82c9b1bae3bf11ef0dd (patch)
tree8512731462e3a198b1c741799f585dd97623edfd
parentc93eaa9a36d5071c19f42debcef978afd89ec994 (diff)
20100226-1131
-rw-r--r--CHANGES2
-rw-r--r--doc/fonts.bem7
-rw-r--r--include/version.h2
-rw-r--r--man/4/keyfs12
4 files changed, 21 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 0ec96c5c..887b19ec 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+20100226
+ mention -n nvram option in keyfs(4)
20100220
appl/cmd/keyfs.b wasn't clunking fids on error in remove [issue 225]
20100213
diff --git a/doc/fonts.bem b/doc/fonts.bem
new file mode 100644
index 00000000..9030241d
--- /dev/null
+++ b/doc/fonts.bem
@@ -0,0 +1,7 @@
+# FONTS=''
+FONTS='.fp 1 R BemboBookMTStd-Regular
+.fp 2 I BemboBookMTStd-Italic
+.fp 3 B BemboBookMTStd-Bold
+.fp 4 BI BemboBookMTStd-BoldIt
+....fp 5 L LucidaCW
+'
diff --git a/include/version.h b/include/version.h
index 9436d6bc..281cc77b 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1 +1 @@
-#define VERSION "Fourth Edition (20100221)"
+#define VERSION "Fourth Edition (20100226)"
diff --git a/man/4/keyfs b/man/4/keyfs
index c49f00f6..03642b96 100644
--- a/man/4/keyfs
+++ b/man/4/keyfs
@@ -7,7 +7,9 @@ keyfs \- encrypted key storage
.B -D
]
[
-.B -m mountpoint
+.BI -m " mountpoint"
+] [
+.BI -n " nvram"
] [
.I keyfile
]
@@ -105,6 +107,14 @@ result in appropriate changes to
.IR keyfile .
.PD
.PP
+If the
+.B -n
+option is given, instead of prompting for the master key,
+.I keyfs
+will read it from the file
+.IR nvram .
+Obviously that file should be well-protected from ordinary observers.
+.PP
The
.B -D
option enables tracing of the file service protocol, for debugging.