From 5b219ac22e55fc6410111fd695c416b6ea50c0ee Mon Sep 17 00:00:00 2001
From: Packet Please <pktpls@systemli.org>
Date: Fri, 26 Jul 2024 00:48:15 +0200
Subject: [PATCH] imageprofile: fix compatibility with snapshot falter-common
 dependencies

---
 group_vars/all/imageprofile.yml                  | 3 ++-
 roles/cfg_openwrt/tasks/conditional_packages.yml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/group_vars/all/imageprofile.yml b/group_vars/all/imageprofile.yml
index 81c1a94a1..d23649505 100644
--- a/group_vars/all/imageprofile.yml
+++ b/group_vars/all/imageprofile.yml
@@ -18,10 +18,11 @@ all__packages__to_merge:
   - ip6tables                  # Its not pulled in by default anymore bc fw4
   - iperf3
   - iwinfo
+  - ip
   - kmod-nft-bridge
   - mtr
   - nftables
-  - tcpdump
+  - tcpdump-mini
   - vnstat
   - -ppp
   - -ppp-mod-pppoe
diff --git a/roles/cfg_openwrt/tasks/conditional_packages.yml b/roles/cfg_openwrt/tasks/conditional_packages.yml
index 5c8fddba6..76222d0c0 100644
--- a/roles/cfg_openwrt/tasks/conditional_packages.yml
+++ b/roles/cfg_openwrt/tasks/conditional_packages.yml
@@ -42,7 +42,7 @@
 
 - name: "Add debugging-packages on core-routers"
   set_fact:
-    packages: "{{ packages + ['mosh-server', 'tmux', 'ip'] }}"
+    packages: "{{ packages + ['mosh-server', 'tmux'] }}"
   when:
     - not (low_flash | default(false))
     - role == 'corerouter'