03/03: berlin: Add a separate, bootable /boot partition and use it.

[Maxim Cournoyer]

apteryx pushed a commit to branch master
in repository maintenance.

commit 6b64909552975a0336f5c87c39be46e4e5e5408d
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Sep 30 12:58:12 2022 -0400

    berlin: Add a separate, bootable /boot partition and use it.
    
    * hydra/berlin.scm (%btrfs-boot-partition): New variable.
    (%btrfs-ssd-uuid, %btrfs-pool-ssd): Delete variables.
    (%common-btrfs-options): Delete comment.
    (bootloader): Register a second efi2 target.
    [file-systems]: Register %btrfs-boot-partition.  Adjust device of
    the /boot/efi mount point.  Add a secnod /boot/efi2 mount point.
    Remove anything that has to do with btrfs-ssd-ssd, which no longer
    exists.  Relocate /home on the SAN.
---
 hydra/berlin.scm | 51 +++++++++++++++++----------------------------------
 1 file changed, 17 insertions(+), 34 deletions(-)

diff --git a/hydra/berlin.scm b/hydra/berlin.scm
index f70f447..24419d5 100644
--- a/hydra/berlin.scm
+++ b/hydra/berlin.scm
@@ -174,37 +174,26 @@ Happy hacking!\n"))
 ;;;
 ;;;  Btrfs pools.
 ;;;
-;;; This Btrfs storage array is composed of six (6) Samsung 870 QVO
-;;; SSDs of 8 TB each; configured to use the raid1c4 Btrfs profile for
-;;; metadata and raid10 for data.
-(define %btrfs-ssd-uuid "16ff18e1-eb41-4224-8df6-80d3b53c411a")
-
-;;; This is one large Btrfs partition on the MDC-provided SAN storage
-;;; (100 TiB).
+;;; Large Btrfs partition on the MDC-provided SAN storage (100 TiB).
 (define %btrfs-san-uuid "d5d1a040-7f2a-4c38-9a89-82f08866f6ec")
 
-;;; TODO: Implement some mcron job that monitors the absent of a disk
-;;; in the array, or IO related errors in dmesg, so that we can notice
-;;; if the Btrfs becomes degraded.
 (define %common-btrfs-options '(("compress-force" . "zstd")
                                 ("space_cache" . "v2")
                                 "degraded"))
 
-(define %btrfs-pool-san
+(define %btrfs-boot-partition
   (file-system
-    ;; This is required by the 'btrbk' backup tool.
-    (device (uuid %btrfs-san-uuid))
-    (mount-point "/mnt/btrfs-pool-san")
+    (device (uuid "7a2d8741-bc5e-489e-a2b9-197b2adb6efb")) ;/dev/sda3
+    (mount-point "/boot")
     (type "btrfs")
     (options (alist->file-system-options
               (cons '("subvolid" . "5")
                     %common-btrfs-options)))))
 
-(define %btrfs-pool-ssd
+(define %btrfs-pool-san
   (file-system
-    ;; This is required by the 'btrbk' backup tool.
-    (device (uuid %btrfs-ssd-uuid))
-    (mount-point "/mnt/btrfs-pool-ssd")
+    (device (uuid %btrfs-san-uuid))
+    (mount-point "/mnt/btrfs-pool-san")
     (type "btrfs")
     (options (alist->file-system-options
               (cons '("subvolid" . "5")
@@ -270,31 +259,25 @@ at MOUNT-POINT."
   ;; Show the GRUB menu on the serial interface.
   (bootloader (bootloader-configuration
                (bootloader grub-efi-bootloader)
-               (targets '("/boot/efi"))
+               (targets '("/boot/efi"
+                          "/boot/efi2"))
                (terminal-inputs '(serial))
                (terminal-outputs '(serial))))
 
   (file-systems (cons*
+                 %btrfs-boot-partition
                  (file-system
                   (mount-point "/boot/efi")
-                  (device (uuid "E1B3-BF92" 'fat)) ;/dev/sdi1
+                  (device (uuid "82BD-8C0E" 'fat)) ;/dev/sda2
                   (type "vfat"))
-
+                 (file-system
+                  (mount-point "/boot/efi2")
+                  (device (uuid "AC37-DE29" 'fat)) ;/dev/sdb2
+                  (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-ssd-uuid "@home" "/home")
-
-                 ;; For convenience.
-                 %btrfs-pool-san
-                 %btrfs-pool-ssd
-                 (file-system
-                   ;; This is device holding the old root file system,
-                   ;; /dev/sdg1.
-                   (device (uuid "76954008-06cf-4b91-b0bb-316d8bab0576"))
-                   (mount-point "/mnt/old-root-fs")
-                   (type "ext4"))
-
+                 (btrfs-subvolume-mount %btrfs-san-uuid "@home" "/home")
                  %base-file-systems))
 
   ;; Local admin account for MDC maintenance.