summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2015-05-04 14:16:03 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-05-04 14:18:14 +0200
commit28e49dcb41e5f83107b637dfdacc932925e83ad3 (patch)
tree4780ba8c98ee5f5af5f5c7ac35388680020a42fb /nixos
parentc2bf9c3ee3da9752b7b19a2078ebcf5f15895b79 (diff)
downloadnixpkgs-28e49dcb41e5f83107b637dfdacc932925e83ad3.tar
nixpkgs-28e49dcb41e5f83107b637dfdacc932925e83ad3.tar.gz
nixpkgs-28e49dcb41e5f83107b637dfdacc932925e83ad3.tar.bz2
nixpkgs-28e49dcb41e5f83107b637dfdacc932925e83ad3.tar.lz
nixpkgs-28e49dcb41e5f83107b637dfdacc932925e83ad3.tar.xz
nixpkgs-28e49dcb41e5f83107b637dfdacc932925e83ad3.tar.zst
nixpkgs-28e49dcb41e5f83107b637dfdacc932925e83ad3.zip
Style fix
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/system/boot/luksroot.nix34
1 files changed, 17 insertions, 17 deletions
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index d9482a8264d..03070bef483 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -303,43 +303,43 @@ in
             twoFactor = mkOption {
               default = true;
               type = types.bool;
-              description = "Whether to use a passphrase and a Yubikey (true), or only a Yubikey (false)";
+              description = "Whether to use a passphrase and a Yubikey (true), or only a Yubikey (false).";
             };
 
             slot = mkOption {
               default = 2;
               type = types.int;
-              description = "Which slot on the Yubikey to challenge";
+              description = "Which slot on the Yubikey to challenge.";
             };
 
             saltLength = mkOption {
               default = 16;
               type = types.int;
-              description = "Length of the new salt in byte (64 is the effective maximum)";
+              description = "Length of the new salt in byte (64 is the effective maximum).";
             };
 
             keyLength = mkOption {
               default = 64;
               type = types.int;
-              description = "Length of the LUKS slot key derived with PBKDF2 in byte";
+              description = "Length of the LUKS slot key derived with PBKDF2 in byte.";
             };
 
             iterationStep = mkOption {
               default = 0;
               type = types.int;
-              description = "How much the iteration count for PBKDF2 is increased at each successful authentication";
+              description = "How much the iteration count for PBKDF2 is increased at each successful authentication.";
             };
 
             gracePeriod = mkOption {
               default = 2;
               type = types.int;
-              description = "Time in seconds to wait before attempting to find the Yubikey";
+              description = "Time in seconds to wait before attempting to find the Yubikey.";
             };
 
             ramfsMountPoint = mkOption {
               default = "/crypt-ramfs";
               type = types.string;
-              description = "Path where the ramfs used to update the LUKS key will be mounted in stage-1";
+              description = "Path where the ramfs used to update the LUKS key will be mounted during early boot.";
             };
 
             /* TODO: Add to the documentation of the current module:
@@ -359,13 +359,13 @@ in
               fsType = mkOption {
                 default = "vfat";
                 type = types.string;
-                description = "The filesystem of the unencrypted device";
+                description = "The filesystem of the unencrypted device.";
               };
 
               mountPoint = mkOption {
                 default = "/crypt-storage";
                 type = types.string;
-                description = "Path where the unencrypted device will be mounted in stage-1";
+                description = "Path where the unencrypted device will be mounted during early boot.";
               };
 
               path = mkOption {
@@ -419,10 +419,10 @@ in
         mkdir -p $out/etc/ssl
         cp -pdv ${pkgs.openssl}/etc/ssl/openssl.cnf $out/etc/ssl
 
-      cat > $out/bin/openssl-wrap <<EOF
-#!$out/bin/sh
-EOF
-      chmod +x $out/bin/openssl-wrap
+        cat > $out/bin/openssl-wrap <<EOF
+        #!$out/bin/sh
+        EOF
+        chmod +x $out/bin/openssl-wrap
       ''}
     '';
 
@@ -432,10 +432,10 @@ EOF
         $out/bin/ykchalresp -V
         $out/bin/ykinfo -V
         cat > $out/bin/openssl-wrap <<EOF
-#!$out/bin/sh
-export OPENSSL_CONF=$out/etc/ssl/openssl.cnf
-$out/bin/openssl "\$@"
-EOF
+        #!$out/bin/sh
+        export OPENSSL_CONF=$out/etc/ssl/openssl.cnf
+        $out/bin/openssl "\$@"
+        EOF
         $out/bin/openssl-wrap version
       ''}
     '';