Merge remote-tracking branch 'origin/pr/102'

* origin/pr/102:
  Correct network-manager qubes service default
  Clarify the network-manager qubes service default
This commit is contained in:
Marek Marczykowski-Górecki 2019-09-06 05:51:13 +02:00
commit 165497d697
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724

View File

@ -87,7 +87,8 @@ crond
Enable CRON service. Enable CRON service.
network-manager network-manager
Default: enabled in NetVM 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 Enable NetworkManager. Only VM with direct access to network device needs
this service, but can be useful in ProxyVM to ease VPN setup. this service, but can be useful in ProxyVM to ease VPN setup.