From fc0680929ded80a5ccdc0131613cb0679b54145d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 16 May 2019 14:37:23 +0200 Subject: vm-image: Remove 'network-manager-applet' from system profile. This is a followup to 05d907ac6fc6e139389a91ab5540c0dc573a8ce7. * gnu/system/examples/vm-image.tmpl (services): Remove 'network-manager-applet'. --- gnu/system/examples/vm-image.tmpl | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gnu/system') diff --git a/gnu/system/examples/vm-image.tmpl b/gnu/system/examples/vm-image.tmpl index 0dbd31fe0a..1ba47a166a 100644 --- a/gnu/system/examples/vm-image.tmpl +++ b/gnu/system/examples/vm-image.tmpl @@ -96,10 +96,13 @@ root ALL=(ALL) ALL ;; 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)) + (eq? 'network-manager-applet + (service-type-name type))))) (modify-services %desktop-services (login-service-type config => (login-configuration -- cgit v1.2.3 From 9c64080dce9fa3e77c48ae962ff1edc5d0863c6a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 16 May 2019 14:42:40 +0200 Subject: vm-image: Remove ModemManager. This is a followup to 36f5d78d4af02ad23c33bfb46702d92086bf2796. * gnu/system/examples/vm-image.tmpl (services): Remove MODEM-MANAGER-SERVICE-TYPE. --- gnu/system/examples/vm-image.tmpl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/system') diff --git a/gnu/system/examples/vm-image.tmpl b/gnu/system/examples/vm-image.tmpl index 1ba47a166a..7d984155bc 100644 --- a/gnu/system/examples/vm-image.tmpl +++ b/gnu/system/examples/vm-image.tmpl @@ -92,15 +92,16 @@ 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))) (or (memq type (list gdm-service-type wpa-supplicant-service-type cups-pk-helper-service-type - network-manager-service-type)) + network-manager-service-type + modem-manager-service-type)) (eq? 'network-manager-applet (service-type-name type))))) (modify-services %desktop-services -- cgit v1.2.3