summaryrefslogtreecommitdiff
path: root/gnu/system
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-05-20 11:48:57 +0200
committerLudovic Courtès <ludo@gnu.org>2019-05-20 11:48:57 +0200
commit99f47b53f755f0a6cb15615c2b9a449a930e82e9 (patch)
tree853674ba28bc780e7916b2ccf044285d71c770b8 /gnu/system
parent8d036f3ecf3b837e8f38c2dca9f8a78568cc664b (diff)
parentfb2abbd6f5abac8ae0fec594594dd54ff7e3f4db (diff)
downloadpatches-99f47b53f755f0a6cb15615c2b9a449a930e82e9.tar
patches-99f47b53f755f0a6cb15615c2b9a449a930e82e9.tar.gz
Merge branch 'version-1.0.1'
Diffstat (limited to 'gnu/system')
-rw-r--r--gnu/system/examples/vm-image.tmpl16
1 files changed, 10 insertions, 6 deletions
diff --git a/gnu/system/examples/vm-image.tmpl b/gnu/system/examples/vm-image.tmpl
index 0dbd31fe0a..7d984155bc 100644
--- a/gnu/system/examples/vm-image.tmpl
+++ b/gnu/system/examples/vm-image.tmpl
@@ -92,14 +92,18 @@ root ALL=(ALL) ALL
;; Use the DHCP client service rather than NetworkManager.
(service dhcp-client-service-type))
- ;; Remove GDM, NetworkManager, and wpa-supplicant, which don't make
- ;; sense in a VM.
+ ;; Remove GDM, ModemManager, NetworkManager, and wpa-supplicant,
+ ;; which don't make sense in a VM.
(remove (lambda (service)
(let ((type (service-kind service)))
- (memq type (list gdm-service-type
- wpa-supplicant-service-type
- cups-pk-helper-service-type
- network-manager-service-type))))
+ (or (memq type
+ (list gdm-service-type
+ wpa-supplicant-service-type
+ cups-pk-helper-service-type
+ network-manager-service-type
+ modem-manager-service-type))
+ (eq? 'network-manager-applet
+ (service-type-name type)))))
(modify-services %desktop-services
(login-service-type config =>
(login-configuration