=== modified file 'initramfs-tools-hook'
--- initramfs-tools-hook	2008-08-12 19:22:34 +0000
+++ initramfs-tools-hook	2008-08-12 19:47:50 +0000
@@ -121,10 +121,10 @@
     cp --archive --sparse=always "$file" "${DESTCONFDIR}"
 done
 # Create key ring files
-LANG=C gpg --quiet --batch --no-tty --no-options \
-    --homedir "${DESTCONFDIR}" --no-permission-warning \
-    --import "${DESTCONFDIR}/seckey.txt" \
-    --import-options import-minimal
+gpg --no-random-seed-file --quiet --batch --no-tty \
+    --no-default-keyring --no-options --homedir "${DESTCONFDIR}" \
+    --no-permission-warning --import-options import-minimal \
+    --import "${DESTCONFDIR}/seckey.txt"
 chown nobody "${DESTCONFDIR}/secring.gpg"
 
 # /keyscripts/mandos-client will drop priviliges, but needs access to

=== modified file 'mandos-keygen'
--- mandos-keygen	2008-08-12 06:46:11 +0000
+++ mandos-keygen	2008-08-12 19:47:50 +0000
@@ -131,8 +131,9 @@
 
 umask 027
 gpg --no-random-seed-file --quiet --batch --no-tty \
-    --no-default-keyring --batch --secret-keyring "$SECRING" \
-    --keyring "$PUBRING" --gen-key "$BATCHFILE"
+    --no-default-keyring --no-options --batch \
+    --secret-keyring "$SECRING" --keyring "$PUBRING" \
+    --gen-key "$BATCHFILE"
 rm --force "$BATCHFILE"
 
 if cp --backup=numbered --force "$SECKEYFILE" "$SECKEYFILE" \