summaryrefslogtreecommitdiff
path: root/gnu/system
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-04-26 18:24:55 +0200
committerLudovic Courtès <ludo@gnu.org>2019-04-26 18:24:55 +0200
commitd7b05620a923757e0fee0888202f69cb96c348c8 (patch)
treef22a075a60db40071497c6bed9a5ad12421bdbd2 /gnu/system
parenta9a0790376c54c9f205a1633ce54dadd204e784e (diff)
vm-image: Remove NetworkManager & co. and add the DHCP client.
* gnu/system/examples/vm-image.tmpl (services): Remove wpa-supplicant, cups-pk-helper, and NetworkManager. Add DHCP-CLIENT-SERVICE-TYPE.
Diffstat (limited to 'gnu/system')
-rw-r--r--gnu/system/examples/vm-image.tmpl16
1 files changed, 12 insertions, 4 deletions
diff --git a/gnu/system/examples/vm-image.tmpl b/gnu/system/examples/vm-image.tmpl
index 62ed032731a..b6f9daaf61c 100644
--- a/gnu/system/examples/vm-image.tmpl
+++ b/gnu/system/examples/vm-image.tmpl
@@ -5,7 +5,7 @@
5;; 5;;
6 6
7(use-modules (gnu) (srfi srfi-1)) 7(use-modules (gnu) (srfi srfi-1))
8(use-service-modules xorg desktop) 8(use-service-modules desktop networking xorg)
9(use-package-modules bootloaders nvi wget xorg) 9(use-package-modules bootloaders nvi wget xorg)
10 10
11(define vm-image-motd (plain-file "motd" " 11(define vm-image-motd (plain-file "motd" "
@@ -71,11 +71,19 @@ accounts.\x1b[0m
71 (default-user "guest") 71 (default-user "guest")
72 (xorg-configuration 72 (xorg-configuration
73 (xorg-configuration 73 (xorg-configuration
74 (keyboard-layout keyboard-layout)))))) 74 (keyboard-layout keyboard-layout)))))
75 75
76 ;; Remove GDM. 76 ;; Use the DHCP client service rather than NetworkManager.
77 (service dhcp-client-service-type))
78
79 ;; Remove GDM, NetworkManager, and wpa-supplicant, which don't make
80 ;; sense in a VM.
77 (remove (lambda (service) 81 (remove (lambda (service)
78 (eq? gdm-service-type (service-kind service))) 82 (let ((type (service-kind service)))
83 (memq type (list gdm-service-type
84 wpa-supplicant-service-type
85 cups-pk-helper-service-type
86 network-manager-service-type))))
79 (modify-services %desktop-services 87 (modify-services %desktop-services
80 (login-service-type config => 88 (login-service-type config =>
81 (login-configuration 89 (login-configuration