~abcdw/rde-devel

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
1

[PATCH] rde: system: Make bare-bone-os in sync with feature bootloader default value

Kirill Yermak <kirill@kimimii.org>
Details
Message ID
<20241104162248.22422-1-kirill@kimimii.org>
DKIM signature
pass
Download raw message
a month ago
Patch: +3 -4 
Implements: https://todo.sr.ht/~abcdw/tickets/67
---
 src/rde/features/system.scm  | 5 ++---
 src/rde/system/bare-bone.scm | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/rde/features/system.scm b/src/rde/features/system.scm
index 9e232438..73d6f003 100644
--- a/src/rde/features/system.scm
+++ b/src/rde/features/system.scm
@@ -1,6 +1,7 @@
(define-module (rde features system)
  #:use-module (rde features)
  #:use-module (rde features predicates)
  #:use-module (rde system bare-bone)
  #:use-module (gnu bootloader)
  #:use-module (gnu bootloader grub)
  #:use-module (gnu packages linux)
@@ -35,9 +36,7 @@


(define %default-bootloader-configuration
  (bootloader-configuration
   (bootloader grub-efi-removable-bootloader)
   (targets '("/boot/efi"))))
  (operating-system-bootloader bare-bone-os))

;; TODO: Add LUKS2 support https://lists.gnu.org/archive/html/grub-devel/2022-07/msg00037.html
(define* (feature-bootloader
diff --git a/src/rde/system/bare-bone.scm b/src/rde/system/bare-bone.scm
index a7b29626..286889e6 100644
--- a/src/rde/system/bare-bone.scm
+++ b/src/rde/system/bare-bone.scm
@@ -12,7 +12,7 @@
   (timezone  "Etc/UTC")
   (locale    "en_US.utf8")
   (bootloader (bootloader-configuration
                (bootloader grub-efi-bootloader)
                (bootloader grub-efi-removable-bootloader)
                (targets '("/boot/efi"))))
   (issue "This is RDE.  Welcome.\n")
   (services '())
-- 
2.47.0
Andrew Tropin <andrew@trop.in>
Details
Message ID
<87a5edlq6c.fsf@trop.in>
In-Reply-To
<20241104162248.22422-1-kirill@kimimii.org> (view parent)
DKIM signature
pass
Download raw message
a month ago 
On 2024-11-04 16:22, Kirill Yermak wrote:

> Implements: https://todo.sr.ht/~abcdw/tickets/67
> ---
>  src/rde/features/system.scm  | 5 ++---
>  src/rde/system/bare-bone.scm | 2 +-
>  2 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/src/rde/features/system.scm b/src/rde/features/system.scm
> index 9e232438..73d6f003 100644
> --- a/src/rde/features/system.scm
> +++ b/src/rde/features/system.scm
> @@ -1,6 +1,7 @@
>  (define-module (rde features system)
>    #:use-module (rde features)
>    #:use-module (rde features predicates)
> +  #:use-module (rde system bare-bone)
>    #:use-module (gnu bootloader)
>    #:use-module (gnu bootloader grub)
>    #:use-module (gnu packages linux)
> @@ -35,9 +36,7 @@
>  
>  
>  (define %default-bootloader-configuration
> -  (bootloader-configuration
> -   (bootloader grub-efi-removable-bootloader)
> -   (targets '("/boot/efi"))))
> +  (operating-system-bootloader bare-bone-os))
>  
>  ;; TODO: Add LUKS2 support https://lists.gnu.org/archive/html/grub-devel/2022-07/msg00037.html
>  (define* (feature-bootloader
> diff --git a/src/rde/system/bare-bone.scm b/src/rde/system/bare-bone.scm
> index a7b29626..286889e6 100644
> --- a/src/rde/system/bare-bone.scm
> +++ b/src/rde/system/bare-bone.scm
> @@ -12,7 +12,7 @@
>     (timezone  "Etc/UTC")
>     (locale    "en_US.utf8")
>     (bootloader (bootloader-configuration
> -                (bootloader grub-efi-bootloader)
> +                (bootloader grub-efi-removable-bootloader)
>                  (targets '("/boot/efi"))))
>     (issue "This is RDE.  Welcome.\n")
>     (services '())

Applied and pushed it as well.

Good job!

-- 
Best regards,
Andrew Tropin
Reply to thread Export thread (mbox)