branch master updated: berlin: Move guix-publish cache to its own Btrfs subvolume.

[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 73984e7  berlin: Move guix-publish cache to its own Btrfs subvolume.
73984e7 is described below

commit 73984e7f956d9af2babfb9c508c107427816da7e
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Tue May 16 11:14:22 2023 -0400

    berlin: Move guix-publish cache to its own Btrfs subvolume.
    
    * hydra/berlin.scm (btrfs-subvolume-mount): Move the DEVICE-UUID to a
     #:device-uuid argument.
    (operating-system) [file-systems]: Add a new mount point for the
    @publish subvolume.
---
 hydra/berlin.scm | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/hydra/berlin.scm b/hydra/berlin.scm
index b2ec2cc..62c35ee 100644
--- a/hydra/berlin.scm
+++ b/hydra/berlin.scm
@@ -6,7 +6,7 @@
 ;; Copyright © 2020, 2021 Florian Pelz <pelzflorian@pelzflorian.de>
 ;; Copyright © 2020, 2021 Mathieu Othacehe <othacehe@gnu.org>
 ;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
-;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;; Copyright © 2023 Andreas Enge <andreas@enge.fr>
 ;; Released under the GNU GPLv3 or any later version.
 
@@ -225,9 +225,11 @@ devices {
               (cons '("subvolid" . "5")
                     %common-btrfs-options)))))
 
-(define (btrfs-subvolume-mount device-uuid name mount-point)
-  "Return a file system to mount the Btrfs subvolume NAME on DEVICE-UUID
-at MOUNT-POINT."
+(define* (btrfs-subvolume-mount name mount-point
+                                #:key (device-uuid %btrfs-san-uuid))
+  "Return a file system to mount the Btrfs subvolume NAME at
+MOUNT-POINT.  DEVICE-UUID can be provided to use a different Btrfs
+file system than the default one hosted on the SAN storage."
   (file-system
     (device (uuid device-uuid))
     (mount-point mount-point)
@@ -305,13 +307,14 @@ at MOUNT-POINT."
                    (device (uuid "67498a2f-3e32-4e8c-96a5-8a4844ea229c")) 
;/dev/sdg3
                    (type "ext4"))
                  (file-system
-                  (mount-point "/boot/efi")
-                  (device (uuid "43AE-6859" 'fat)) ;/dev/sdg2
-                  (type "vfat"))
+                   (mount-point "/boot/efi")
+                   (device (uuid "43AE-6859" 'fat)) ;/dev/sdg2
+                   (type "vfat"))
                  %btrfs-pool-san        ;for convenience
-                 (btrfs-subvolume-mount %btrfs-san-uuid "@root" "/")
-                 (btrfs-subvolume-mount %btrfs-san-uuid "@cache" "/var/cache")
-                 (btrfs-subvolume-mount %btrfs-san-uuid "@home" "/home")
+                 (btrfs-subvolume-mount "@root" "/")
+                 (btrfs-subvolume-mount "@cache" "/var/cache")
+                 (btrfs-subvolume-mount "@home" "/home")
+                 (btrfs-subvolume-mount "@publish" "/var/cache/guix/publish")
                  %base-file-systems))
 
   ;; Local admin account for MDC maintenance.