Merge branch 'linux-improve-old-kernel-message'

3 files changed, 15 insertions, 2 deletions

diff --git a/gui/locales/messages.pot b/gui/locales/messages.pot
index fd19504fa1..e66591d010 100644
--- a/gui/locales/messages.pot
+++ b/gui/locales/messages.pot
@@ -212,6 +212,10 @@ msgid "Failed to apply firewall rules. The device might currently be unsecured"
 msgstr ""
 
 msgctxt "in-app-notifications"
+msgid "Your kernel may be outdated"
+msgstr ""
+
+msgctxt "in-app-notifications"
 msgid "Failed to set system DNS server"
 msgstr ""
 
diff --git a/gui/src/renderer/components/NotificationArea.tsx b/gui/src/renderer/components/NotificationArea.tsx
index 6405e9828f..062bb45da7 100644
--- a/gui/src/renderer/components/NotificationArea.tsx
+++ b/gui/src/renderer/components/NotificationArea.tsx
@@ -50,10 +50,14 @@ function getBlockReasonMessage(blockReason: BlockReason): string {
         'Could not configure IPv6, please enable it on your system or disable it in the app',
       );
     case 'set_firewall_policy_error':
-      return messages.pgettext(
+      return `${messages.pgettext(
         'in-app-notifications',
         'Failed to apply firewall rules. The device might currently be unsecured',
-      );
+      )}${
+        process.platform === 'linux'
+          ? '. ' + messages.pgettext('in-app-notifications', 'Your kernel may be outdated')
+          : ''
+      }`;
     case 'set_dns_error':
       return messages.pgettext('in-app-notifications', 'Failed to set system DNS server');
     case 'start_tunnel_error':
diff --git a/mullvad-cli/src/cmds/status.rs b/mullvad-cli/src/cmds/status.rs
index 0f82591eea..8642c581ce 100644
--- a/mullvad-cli/src/cmds/status.rs
+++ b/mullvad-cli/src/cmds/status.rs
@@ -87,6 +87,11 @@ fn print_blocked_reason(reason: &BlockReason) {
                 .unwrap_or("Account authentication failed");
             println!("Blocked: {}", AuthFailed::from(auth_failure_str));
         }
+        #[cfg(target_os = "linux")]
+        BlockReason::SetFirewallPolicyError => {
+            println!("Blocked: {}", BlockReason::SetFirewallPolicyError);
+            println!("Your kernel might be terribly out of date or missing nftables");
+        }
         other => println!("Blocked: {}", other),
     }
 }