branch master updated: berlin: Migrate /var/cache to the new Btrfs array.

[Maxim Cournoyer]

This is an automated email from the git hooks/post-receive script.

apteryx pushed a commit to branch master
in repository maintenance.

The following commit(s) were added to refs/heads/master by this push:
     new 37f76bb  berlin: Migrate /var/cache to the new Btrfs array.
37f76bb is described below

commit 37f76bb0a068c6a6d6ab3a65a0ede68c031e5754
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Feb 9 00:22:32 2022 -0500

    berlin: Migrate /var/cache to the new Btrfs array.
    
    * hydra/berlin.scm (@cache): New variable.
    (operating-system)[file-systems]: Add it, and remove the obsolete
    /var/cache bind mount.
---
 hydra/berlin.scm | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/hydra/berlin.scm b/hydra/berlin.scm
index bbf339d..210e319 100644
--- a/hydra/berlin.scm
+++ b/hydra/berlin.scm
@@ -214,6 +214,17 @@ Happy hacking!\n"))
                     %common-btrfs-options)))
     (dependencies (list @root))))
 
+;;; Cache Btrfs subvolume.
+(define @cache
+  (file-system
+    (device (uuid %btrfs-raid-uuid))
+    (mount-point "/var/cache")
+    (type "btrfs")
+    (options (alist->file-system-options
+              (cons '("subvol" . "@cache")
+                    %common-btrfs-options)))
+    (dependencies (list @root))))
+
 
 (operating-system
   (host-name "berlin.guix.gnu.org")
@@ -255,12 +266,6 @@ Happy hacking!\n"))
                    (device (uuid "a6455b66-59d2-40bd-bddb-0c572bb62a2f"))
                    (mount-point "/gnu")
                    (type "ext4"))
-                 ;; Bind mount cache to large external storage.
-                 (file-system
-                   (device "/gnu/cache")
-                   (mount-point "/var/cache")
-                   (flags '(bind-mount))
-                   (type "none"))
                  ;; Access root file system without bind mounts.
                  (file-system
                    (device "/")
@@ -270,6 +275,7 @@ Happy hacking!\n"))
                  %btrfs-pool
                  @root
                  @home
+                 @cache
                  %base-file-systems))
 
   ;; Local admin account for MDC maintenance.