diff options
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/examples/bare-hurd.tmpl | 9 | ||||
| -rw-r--r-- | gnu/system/examples/lightweight-desktop.tmpl | 4 | ||||
| -rw-r--r-- | gnu/system/hurd.scm | 25 | ||||
| -rw-r--r-- | gnu/system/images/pine64.scm | 9 | ||||
| -rw-r--r-- | gnu/system/install.scm | 6 |
5 files changed, 43 insertions, 10 deletions
diff --git a/gnu/system/examples/bare-hurd.tmpl b/gnu/system/examples/bare-hurd.tmpl index 414a9379c8..e4b795ff27 100644 --- a/gnu/system/examples/bare-hurd.tmpl +++ b/gnu/system/examples/bare-hurd.tmpl @@ -40,15 +40,20 @@ %base-file-systems)) (host-name "guixygnu") (timezone "Europe/Amsterdam") + (users (cons (user-account + (name "guix") + (comment "Anonymous Hurd Hacker") + (group "users") + (supplementary-groups '("wheel"))) + %base-user-accounts)) (packages (cons openssh-sans-x %base-packages/hurd)) (services (cons (service openssh-service-type (openssh-configuration (openssh openssh-sans-x) - (use-pam? #f) (port-number 2222) (permit-root-login #t) (allow-empty-passwords? #t) (password-authentication? #t))) - %base-services/hurd)))) + %base-services/hurd)))) %hurd-os diff --git a/gnu/system/examples/lightweight-desktop.tmpl b/gnu/system/examples/lightweight-desktop.tmpl index b4037d4f79..d5a63dc457 100644 --- a/gnu/system/examples/lightweight-desktop.tmpl +++ b/gnu/system/examples/lightweight-desktop.tmpl @@ -4,7 +4,8 @@ (use-modules (gnu) (gnu system nss)) (use-service-modules desktop) -(use-package-modules bootloaders certs ratpoison suckless wm xorg) +(use-package-modules bootloaders certs emacs emacs-xyz ratpoison suckless wm + xorg) (operating-system (host-name "antelope") @@ -43,6 +44,7 @@ (packages (append (list ;; window managers ratpoison i3-wm i3status dmenu + emacs emacs-exwm emacs-desktop-environment ;; terminal emulator xterm ;; for HTTPS access diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 80fffe8e45..8b46e65e31 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -26,8 +26,10 @@ #:use-module (gnu packages admin) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages compression) #:use-module (gnu packages cross-base) #:use-module (gnu packages file) + #:use-module (gnu packages gawk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) #:use-module (gnu packages hurd) @@ -42,7 +44,8 @@ #:export (%base-packages/hurd %base-services/hurd %hurd-default-operating-system - %hurd-default-operating-system-kernel)) + %hurd-default-operating-system-kernel + %setuid-programs/hurd)) ;;; Commentary: ;;; @@ -61,8 +64,9 @@ (define %base-packages/hurd (list hurd bash coreutils file findutils grep sed - guile-3.0 guile-colorized guile-readline - net-base inetutils less shepherd which)) + diffutils patch gawk tar gzip bzip2 xz lzip + guile-3.0-latest guile-colorized guile-readline + net-base inetutils less shadow shepherd sudo which)) (define %base-services/hurd (list (service hurd-console-service-type @@ -86,6 +90,17 @@ `(("/bin/sh" ,(file-append bash "/bin/sh")) ("/usr/bin/env" ,(file-append coreutils "/bin/env")))))) +(define %setuid-programs/hurd + ;; Default set of setuid-root programs. + (list (file-append shadow "/bin/passwd") + (file-append shadow "/bin/sg") + (file-append shadow "/bin/su") + (file-append shadow "/bin/newgrp") + (file-append shadow "/bin/newuidmap") + (file-append shadow "/bin/newgidmap") + (file-append sudo "/bin/sudo") + (file-append sudo "/bin/sudoedit"))) + (define %hurd-default-operating-system (operating-system (kernel %hurd-default-operating-system-kernel) @@ -103,6 +118,4 @@ (timezone "GNUrope") (name-service-switch #f) (essential-services (hurd-default-essential-services this-operating-system)) - (pam-services '()) - (setuid-programs '()) - (sudoers-file #f))) + (setuid-programs %setuid-programs/hurd))) diff --git a/gnu/system/images/pine64.scm b/gnu/system/images/pine64.scm index c738a77078..f0b0c3f50d 100644 --- a/gnu/system/images/pine64.scm +++ b/gnu/system/images/pine64.scm @@ -28,7 +28,8 @@ #:use-module (gnu system image) #:use-module (srfi srfi-26) #:export (pine64-barebones-os - pine64-image-type)) + pine64-image-type + pine64-barebones-raw-image)) (define pine64-barebones-os (operating-system @@ -57,3 +58,9 @@ (image-type (name 'pine64-raw) (constructor (cut image-with-os arm64-disk-image <>)))) + +(define pine64-barebones-raw-image + (image + (inherit + (os->image pine64-barebones-os #:type pine64-image-type)) + (name 'pine64-barebones-raw-image))) diff --git a/gnu/system/install.scm b/gnu/system/install.scm index be5a678cec..eb342665e5 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -445,6 +445,12 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m (label (string-append "GNU Guix installation " (package-version guix))) + ;; XXX: The AMD Radeon driver is reportedly broken, which makes kmscon + ;; non-functional: + ;; <https://lists.gnu.org/archive/html/guix-devel/2019-03/msg00441.html>. + ;; Thus, blacklist it. + (kernel-arguments '("quiet" "modprobe.blacklist=radeon")) + (file-systems ;; Note: the disk image build code overrides this root file system with ;; the appropriate one. |