diff --git a/qubesmanager/settings.py b/qubesmanager/settings.py
index e17a9f6..6d267b1 100644
--- a/qubesmanager/settings.py
+++ b/qubesmanager/settings.py
@@ -317,10 +317,15 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtWidgets.QDialog):
def check_network_availability(self):
netvm = self.vm.netvm
- self.no_netvm_label.setVisible(netvm is None)
+ try:
+ provides_network = self.vm.provides_network
+ except AttributeError:
+ provides_network = False
+ self.no_netvm_label.setVisible(netvm is None and not provides_network)
self.netvm_no_firewall_label.setVisible(
netvm is not None and
not netvm.features.check_with_template('qubes-firewall', False))
+ self.sysnet_warning_label.setVisible(netvm is None and provides_network)
def current_tab_changed(self, idx):
if idx == self.tabs_indices["firewall"]:
diff --git a/ui/settingsdlg.ui b/ui/settingsdlg.ui
index e834443..5a7da54 100644
--- a/ui/settingsdlg.ui
+++ b/ui/settingsdlg.ui
@@ -907,6 +907,67 @@ The qube must be running to disable seamless mode; this setting is not persisten
Firewall rules
+ -
+
+
+ true
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ Allow full access for
+
+
+
+ -
+
+
+ min
+
+
+ 5
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+
+ -
+
+
+ NOTE: To block all network access, set Networking to (none) on the Basic settings tab. This tab provides a very simplified firewall configuration. All DNS requests and ICMP (pings) will be allowed. For more granular control, use the command line tool qvm-firewall.
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
+
+
+ true
+
+
+
-
@@ -961,6 +1022,20 @@ The qube must be running to disable seamless mode; this setting is not persisten
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+ List of allowed (whitelisted) addresses:
+
+
+
-
@@ -1063,42 +1138,7 @@ The qube must be running to disable seamless mode; this setting is not persisten
- -
-
-
-
-
-
- Allow all outgoing Internet connections
-
-
-
- -
-
-
- Changing firewall settings does NOT affect existing connections.
-
-
- Limit outgoing Internet connections to ...
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- -
-
-
- List of allowed (whitelisted) addresses:
-
-
-
- -
+
-
QLayout::SetMaximumSize
@@ -1211,64 +1251,75 @@ The qube must be running to disable seamless mode; this setting is not persisten
- -
-
-
- true
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
- Allow full access for
-
-
-
- -
-
-
- min
-
-
- 5
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
+ -
+
+
-
+
+
+ Allow all outgoing Internet connections
+
+
+
+ -
+
+
+ Changing firewall settings does NOT affect existing connections.
+
+
+ Limit outgoing Internet connections to ...
+
+
+
+
- -
-
+
-
+
+
+
+
+
+
+
+ 239
+ 41
+ 41
+
+
+
+
+
+
+
+
+ 239
+ 41
+ 41
+
+
+
+
+
+
+
+
+ 190
+ 190
+ 190
+
+
+
+
+
+
+
+
+ 75
+ true
+ true
+
+
- NOTE: To block all network access, set Networking to (none) on the Basic settings tab. This tab provides a very simplified firewall configuration. All DNS requests and ICMP (pings) will be allowed. For more granular control, use the command line tool qvm-firewall.
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
-
-
- true
+ This qube has direct network access and Qubes Firewall settings will not be used. Configure other qubes' network access in their network settings or in a dedicated firewall qube.