Add working search paths for cryptodisks.

1 files changed, 7 insertions, 8 deletions

diff --git a/sigils/bootloader/grub.scm b/sigils/bootloader/grub.scm
index e1f1b76..4c442ba 100644
--- a/sigils/bootloader/grub.scm
+++ b/sigils/bootloader/grub.scm
@@ -49,6 +49,7 @@
             #~(call-with-output-file #$output
                 (lambda (port)
                   (use-modules (ice-9 textual-ports)
+                               (ice-9 string-fun)
                                ;; delete-duplicates in needed gexps
                                (srfi srfi-1))
 
@@ -56,14 +57,12 @@
                   (display "insmod lvm\n" port)
 
                   (display
-                   (string-join
-                    (filter
-                     ;; Let's get straight to the point.
-                     (lambda (line)
-                       (not (string-prefix? "search --label --set" (string-trim line))))
-                     (string-split
-                      (call-with-input-file #$original-grub-cfg get-string-all) #\newline))
-                    "\n") port)
+                   ;; Let's get straight to the point.
+                   (string-replace-substring
+                    (call-with-input-file #$original-grub-cfg get-string-all)
+                    "search --label --set rootfs" ;; to replace with something working on all systems
+                    "search --label --set bootfs")
+                   port)
 
                   (display "\n\n" port)