features: get-operating-system: Disable double sudoers-file. v1 APPLIED

Nicolas Graves: 3
 features: get-operating-system: Disable double sudoers-file.
 system: install: Add module for linux-libre.
 system: install: live-os should return an OS.

 3 files changed, 23 insertions(+), 20 deletions(-)

Current live image is located in examples/src/abcdw/hosts/live.scm
https://git.sr.ht/~abcdw/rde/tree/81317ac9289d299f78ca501038d5fa851ffb2d4e/examples/src/abcdw/hosts/live.scm#L42

I think we can deprecate rde/system/install in the future.

Just a quick reminder here ;)

[PATCH 1/3] features: get-operating-system: Disable double sudoers-file. Export this patch

---
 src/rde/features.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/rde/features.scm b/src/rde/features.scm
index 6cb3bfe1..7ba64035 100644
--- a/src/rde/features.scm
+++ b/src/rde/features.scm
@@ -417,7 +417,8 @@ to config one more time."
                  (list (service sudoers-service-type))
                  (if user-name
                      (list (service rde-account-service-type user))
-                     '()))))))
+                     '())))
+      (sudoers-file #f))))
 
 (define (pretty-print-rde-config config)
   (use-modules (gnu services)

Andrew Tropin <andrew@trop.in>

2 months ago

Maybe in the future it would be cool to inherit from a value of
sudoers-file field of operating-system record for plain guix -> rde
migration use cases.

-- 
2.39.2

[PATCH 2/3] system: install: Add module for linux-libre. Export this patch

---
 src/rde/system/install.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/rde/system/install.scm b/src/rde/system/install.scm
index 024a1293..0029b26d 100644
--- a/src/rde/system/install.scm
+++ b/src/rde/system/install.scm
@@ -1,5 +1,6 @@
 (define-module (rde system install)
   #:use-module (gnu)
+  #:use-module (gnu packages linux)
   #:use-module (gnu system)
   #:use-module (gnu system install)
   #:use-module (rde features)
-- 
2.39.2

[PATCH 3/3] system: install: live-os should return an OS. Export this patch

---
 src/rde/system/install.scm | 39 +++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/rde/system/install.scm b/src/rde/system/install.scm
index 0029b26d..22280d93 100644
--- a/src/rde/system/install.scm
+++ b/src/rde/system/install.scm
@@ -41,22 +41,23 @@
           (custom-system-services '())
           (supplementary-system-packages '())
           (supplementary-features '())) ;; user-preferences
-  (rde-config
-   (initial-os installation-os)
-   (features
-    (append
-     supplementary-features
-     (list
-      (feature-file-systems
-       #:file-systems live-file-systems)
-      (feature-kernel
-       #:kernel kernel
-       #:firmware kernel-firmware)
-      (feature-base-packages
-       #:system-packages supplementary-system-packages)
-      (feature-custom-services
-       #:feature-name-prefix 'live
-       #:system-services custom-system-services)
-      (feature-base-services
-       #:guix-substitute-urls guix-substitute-urls
-       #:guix-authorized-keys guix-authorized-keys))))))
+  (rde-config-operating-system
+   (rde-config
+    (initial-os installation-os)
+    (features
+     (append
+      supplementary-features
+      (list
+       (feature-file-systems
+        #:file-systems live-file-systems)
+       (feature-kernel
+        #:kernel kernel
+        #:firmware kernel-firmware)
+       (feature-base-packages
+        #:system-packages supplementary-system-packages)
+       (feature-custom-services
+        #:feature-name-prefix 'live
+        #:system-services custom-system-services)
+       (feature-base-services
+        #:guix-substitute-urls guix-substitute-urls
+        #:guix-authorized-keys guix-authorized-keys)))))))
-- 
2.39.2

Andrew Tropin <andrew@trop.in>

2 months ago

Current live image is located in examples/src/abcdw/hosts/live.scm
https://git.sr.ht/~abcdw/rde/tree/81317ac9289d299f78ca501038d5fa851ffb2d4e/examples/src/abcdw/hosts/live.scm#L42

I think we can deprecate rde/system/install in the future.

Nicolas Graves <ngraves@ngraves.fr>

2 months ago

Just a quick reminder here ;)