From ece2fd121866e4f46c5a4be92c6f09b6c1042ea1 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 21 Jan 2019 19:35:47 +0100 Subject: gnu: Fix missing EFI entry in "desktop" example. * gnu/system/examples/desktop.tmpl (file-systems): Add EFI file-system. --- gnu/system/examples/desktop.tmpl | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'gnu/system/examples/desktop.tmpl') diff --git a/gnu/system/examples/desktop.tmpl b/gnu/system/examples/desktop.tmpl index 1b8d46afaf..e20b472363 100644 --- a/gnu/system/examples/desktop.tmpl +++ b/gnu/system/examples/desktop.tmpl @@ -25,12 +25,17 @@ (target "my-root") (type luks-device-mapping)))) - (file-systems (cons (file-system - (device (file-system-label "my-root")) - (mount-point "/") - (type "ext4") - (dependencies mapped-devices)) - %base-file-systems)) + (file-systems (append + (list (file-system + (device (file-system-label "my-root")) + (mount-point "/") + (type "ext4") + (dependencies mapped-devices)) + (file-system + (device (uuid "1234-ABCD" 'fat)) + (mount-point "/boot/efi") + (type "vfat"))) + %base-file-systems)) (users (cons (user-account (name "bob") -- cgit v1.2.3 From 907dd32720cf7ae94876c1da2df775f524f5f795 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 21 Jan 2019 19:37:59 +0100 Subject: gnu: Replace all cons* with beginner-friendly (append (list ...)). * gnu/system/examples/bare-bones.tmpl (services): Do it. * gnu/system/examples/beaglebone.tmpl (packages): Do it. (services): Do it. * gnu/system/examples/desktop.tmpl (packages): Do it. (services): Do it. * gnu/system/examples/lightweight-desktop.tmpl (file-systems): Do it. (packages): Do it. * gnu/system/examples/vm-image.tmpl (packages): Do it. --- gnu/system/examples/desktop.tmpl | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'gnu/system/examples/desktop.tmpl') diff --git a/gnu/system/examples/desktop.tmpl b/gnu/system/examples/desktop.tmpl index e20b472363..c59bf92681 100644 --- a/gnu/system/examples/desktop.tmpl +++ b/gnu/system/examples/desktop.tmpl @@ -47,17 +47,20 @@ %base-user-accounts)) ;; This is where we specify system-wide packages. - (packages (cons* nss-certs ;for HTTPS access - gvfs ;for user mounts - %base-packages)) + (packages (append (list + ;; for HTTPS access + nss-certs + ;; for user mounts + gvfs) + %base-packages)) ;; Add GNOME and/or Xfce---we can choose at the log-in ;; screen with F1. Use the "desktop" services, which ;; include the X11 log-in service, networking with ;; NetworkManager, and more. - (services (cons* (gnome-desktop-service) - (xfce-desktop-service) - %desktop-services)) + (services (append (list (gnome-desktop-service) + (xfce-desktop-service)) + %desktop-services)) ;; Allow resolution of '.local' host names with mDNS. (name-service-switch %mdns-host-lookup-nss)) -- cgit v1.2.3