summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorMichael Raitza <git@spacefrogg.net>2020-11-17 21:00:40 +0100
committerMichael Raitza <git@spacefrogg.net>2020-11-17 21:31:59 +0100
commit1f323ec2b47c53246ac7b0ebab53680af4c995e8 (patch)
tree981b4a835e3ccfd091fdab314bea1b9f8c50bd4b /nixos
parent6cdf5b354aa8491a86bad694bc8936996467dc36 (diff)
downloadnixpkgs-1f323ec2b47c53246ac7b0ebab53680af4c995e8.tar
nixpkgs-1f323ec2b47c53246ac7b0ebab53680af4c995e8.tar.gz
nixpkgs-1f323ec2b47c53246ac7b0ebab53680af4c995e8.tar.bz2
nixpkgs-1f323ec2b47c53246ac7b0ebab53680af4c995e8.tar.lz
nixpkgs-1f323ec2b47c53246ac7b0ebab53680af4c995e8.tar.xz
nixpkgs-1f323ec2b47c53246ac7b0ebab53680af4c995e8.tar.zst
nixpkgs-1f323ec2b47c53246ac7b0ebab53680af4c995e8.zip
openafs: remove 1.6; point to openafs_1_8
Diffstat (limited to 'nixos')
-rw-r--r--nixos/doc/manual/release-notes/rl-2103.xml6
-rw-r--r--nixos/modules/services/network-filesystems/openafs/server.nix1
2 files changed, 6 insertions, 1 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index 5c017c65a25..da4f083d01a 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -172,6 +172,12 @@
       please note that your non-root pools will now be forcibly imported.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     <package>openafs</package> now points to <package>openafs_1_8</package>,
+     which is the new stable release.  OpenAFS 1.6 was removed.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/nixos/modules/services/network-filesystems/openafs/server.nix b/nixos/modules/services/network-filesystems/openafs/server.nix
index 095024d2c8a..d782f782165 100644
--- a/nixos/modules/services/network-filesystems/openafs/server.nix
+++ b/nixos/modules/services/network-filesystems/openafs/server.nix
@@ -251,7 +251,6 @@ in {
         wantedBy = [ "multi-user.target" ];
         restartIfChanged = false;
         unitConfig.ConditionPathExists = [
-          "|/etc/openafs/server/rxkad.keytab"
           "|/etc/openafs/server/KeyFileExt"
         ];
         preStart = ''