From cef300b0c740f1f0414b1b6b9a641a862db943dd Mon Sep 17 00:00:00 2001 From: hexagonrecursion <52621858+hexagonrecursion@users.noreply.github.com> Date: Fri, 30 Aug 2019 07:22:35 +0000 Subject: [PATCH 1/2] Clarify the network-manager qubes service default --- doc/manpages/qvm-service.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/manpages/qvm-service.rst b/doc/manpages/qvm-service.rst index c017c97..0c84fd9 100644 --- a/doc/manpages/qvm-service.rst +++ b/doc/manpages/qvm-service.rst @@ -87,7 +87,8 @@ crond Enable CRON service. network-manager - Default: enabled in NetVM + Default: enabled in every qube that has provides_network preference + set to True and disabled in all other qubes Enable NetworkManager. Only VM with direct access to network device needs this service, but can be useful in ProxyVM to ease VPN setup. From 2c4cb44b5c9a6444eeca513018192bfb7a8d79c5 Mon Sep 17 00:00:00 2001 From: hexagonrecursion <52621858+hexagonrecursion@users.noreply.github.com> Date: Fri, 30 Aug 2019 07:33:27 +0000 Subject: [PATCH 2/2] Correct network-manager qubes service default --- doc/manpages/qvm-service.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/manpages/qvm-service.rst b/doc/manpages/qvm-service.rst index 0c84fd9..3b4ae5e 100644 --- a/doc/manpages/qvm-service.rst +++ b/doc/manpages/qvm-service.rst @@ -87,8 +87,8 @@ crond Enable CRON service. network-manager - Default: enabled in every qube that has provides_network preference - set to True and disabled in all other qubes + Default: enabled in every qube that has no netvm and has provides_network + preference set to True Enable NetworkManager. Only VM with direct access to network device needs this service, but can be useful in ProxyVM to ease VPN setup.