certs/gpgkey.asc

@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mDMEZOu3hBYJKwYBBAHaRw8BAQdA2vMy2QY03GrTkJ5u+1933D28aJWSqFLy3vPV
-h2PotU60IUZyZXlhIE11cnBoeSA8ZnJleWFAZnJleWFjYXQub3JnPoiTBBMWCAA7
-AhsBBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAFiEET2vBHOuy8kIUuQ+sn/aTe4Ke
-VloFAmVA+KsCGQEACgkQn/aTe4KeVlqGWQEAmm53JKWNP/EqvyAPIZG6mg3YAT5n
-Et0dvaf5oBD2Ln4BAO6Q+y3T1z7lVgPQ9/6ZbEs6B71d4j7r2BpwcW1JYcUAuDME
-ZbQwJBYJKwYBBAHaRw8BAQdANDr2TS2dtdDDNjRErbREUhlWUBb5no+m+jyY0/1m
-UIyI9QQYFgoAJhYhBE9rwRzrsvJCFLkPrJ/2k3uCnlZaBQJltDAkAhsCBQkB4TOA
-AIEJEJ/2k3uCnlZadiAEGRYKAB0WIQRtx1BmlDfxN0SCiq50SrgA44OuUgUCZbQw
-JAAKCRB0SrgA44OuUhSxAP40Z0MxS2rCLveOECqaFw5iGPxuj2/vJIwPEKuYGIS+
-yAEA8nqcirOU1Gz35/wOohc9lAApWt0FIrsdO+aLmtoAvQzlOwD+MOjKtIbn8vZl
-NiAX7L+tBlH+GMDQb4dnQB5ZD1LWqgMBAMor6ZVHFh/ptQeihIWcDRpo9j0vf1X8
-21EVnzNmW3ULuDMEZbQwMhYJKwYBBAHaRw8BAQdA9K8LXdWBm4/jSRY/zZ+e62EP
-qHadeubm5GCJxk1JFMOIfgQYFgoAJhYhBE9rwRzrsvJCFLkPrJ/2k3uCnlZaBQJl
-tDAyAhsgBQkB4TOAAAoJEJ/2k3uCnlZaH14BAM5rlzk6SyYw/RC0WV8TqNrsEhfF
-4vrmVlGAM7pSuEAzAP0XCTglAX0gOqD5tfFGEg7YD2Vzec7TBsmR3Tlm68rKCbg4
-BGW0MEISCisGAQQBl1UBBQEBB0BmIRgbKdHNE+LJyvcchhcYkSvJCAHPTBq5zSbn
-151dYAMBCAeIfgQYFgoAJhYhBE9rwRzrsvJCFLkPrJ/2k3uCnlZaBQJltDBCAhsM
-BQkB4TOAAAoJEJ/2k3uCnlZaWCQBAOhUcEFvQlDsGgk8uCu/VUJ0WF+WUKEE1fNO
-aELmCNRZAQCGrmtATHxJKbX0kzIxEmRti9knTG9z9pU8f+4E2i0oDpgzBGW0LwcW
-CSsGAQQB2kcPAQEHQOXmMS+5LUmgP5hnW8es2lYVpCxEVGhtB0Oc0O26Uw2RtCFG
-cmV5YSBNdXJwaHkgPGZyZXlhQGZyZXlhY2F0Lm9yZz6IkwQTFgoAOxYhBLc/ajyD
-s4yQM5eA4F1n9JmDex1gBQJltC8HAhsBBQsJCAcCAiICBhUKCQgLAgQWAgMBAh4H
-AheAAAoJEF1n9JmDex1g0ZkBAI3EHj3JeVENSHEoOrTwp3s7CANt0ix+3t1BFZ6X
-nGoKAP43LCopn8+bXdjx/OhTbQi7bzBatc7c68O1KgkAV4olBw==
-=oGkO
------END PGP PUBLIC KEY BLOCK-----
-

modules/freya/bootloader/uki.scm

@@ -44,12 +44,14 @@
                          (ice-9 popen) (ice-9 textual-ports))
 
             (define (out name) (string-append vendir "/" name))
-            (define disk
+            (define fulldisk
               (call-with-port
                 (open-pipe* OPEN_READ findmnt "-fnro" "SOURCE" "-T" target)
                 (lambda (port) (get-line port)))) ; only 1 line: the device
+            (define disk
+              (substring fulldisk 0 (- (string-length fulldisk) 1)))
             (define part
-              (substring disk (- (string-length disk) 1)))
+              (substring fulldisk (- (string-length fulldisk) 1)))
 
             ;; delete all boot entries and files we control
             (when (file-exists? schema)

systems/shinji.scm

@@ -7,22 +7,18 @@
 
   (mapped-devices (list (mapped-device
                           (source (uuid
-                                    "ad489bfa-4280-44ea-8ad2-60347b516d60"))
-                          (target "root")
+                                    "5c5dcb22-62b1-41af-9116-b8fdfba83ca2"))
+                          (target "cryptroot")
                           (type luks-device-mapping))))
 
-  (swap-devices (list (swap-space
-                        (target (uuid
-                                  "57caa02d-8569-43e3-8bf9-09dd6f02b191")))))
-
   (file-systems (cons* (file-system
                          (mount-point "/")
-                         (device "/dev/mapper/root")
+                         (device "/dev/mapper/cryptroot")
                          (type "btrfs")
                          (dependencies mapped-devices))
                        (file-system
                          (mount-point "/boot/efi")
-                         (device (uuid "6F93-6A0B"
+                         (device (uuid "AD5A-4DF3"
                                        'fat32))
                          (type "vfat"))
                        %freya-file-systems)))