Merge branch 'devel' into feature/buster

config/chroot_local-includes/etc/sysctl.d/disable_ipv6.conf

+net.ipv6.conf.default.disable_ipv6 = 1
+net.ipv6.conf.all.disable_ipv6 = 1
+
+# Some programs expect the loopback interface to have IPv6 enabled
+net.ipv6.conf.lo.disable_ipv6 = 0

config/chroot_local-includes/usr/share/initramfs-tools/scripts/init-premount/partitioning

@@ -102,7 +102,7 @@ sgdisk \
 log_end_msg
 
 # Tell the kernel to reload the partition table
-partprobe
+partprobe "${PARENT_DEVICE}"
 
 # fatresize overwrites the VBR, so we have to back it up to be able to
 # restore the boot code later
@@ -139,4 +139,4 @@ sgdisk \
 	"${PARENT_DEVICE}"
 
 # Tell the kernel to reload the partition table
-partprobe
+partprobe "${PARENT_DEVICE}"

features/additional_software_packages.feature

@@ -64,7 +64,7 @@ Feature: Additional software
     And I refuse adding "cowsay" to Additional Software
     Then "cowsay" is not in the list of Additional Software
 
-  # Depends on scenario: Packages I remove from Additional Software through the GUI are not in the Additional Software list anymore
+  # Depends on scenario: My Additional Software list is configurable through a GUI or through notifications when I install or remove packages with APT or Synaptic
   # See https://tails.boum.org/blueprint/additional_software_packages/offline_mode/#incomplete-online-upgrade for high level logic
   Scenario: Recovering in offline mode after Additional Software previously failed to upgrade and then succeed to upgrade when online
     Given a computer

features/support/helpers/firewall_helper.rb

@@ -10,6 +10,8 @@ end
 # address/port) in the graph of all network flows.
 def pcap_connections_helper(pcap_file, opts = {})
   opts[:ignore_dhcp] = true unless opts.has_key?(:ignore_dhcp)
+  opts[:ignore_arp] = true unless opts.has_key?(:ignore_arp)
+  opts[:ignore_sources] ||= [$vm.vmnet.bridge_mac]
   connections = Array.new
   packets = PacketFu::PcapFile.new.file_to_array(:filename => pcap_file)
   packets.each do |p|
@@ -39,6 +41,9 @@ def pcap_connections_helper(pcap_file, opts = {})
     elsif PacketFu::IPPacket.can_parse?(p)
       ip_packet = PacketFu::IPPacket.parse(p)
       protocol = 'ip'
+    elsif PacketFu::ARPPacket.can_parse?(p)
+      ip_packet = PacketFu::ARPPacket.parse(p)
+      protocol = 'arp'
     else
       raise "Found something that cannot be parsed"
     end
@@ -46,6 +51,8 @@ def pcap_connections_helper(pcap_file, opts = {})
     next if opts[:ignore_dhcp] &&
             looks_like_dhcp_packet?(eth_packet, protocol,
                                     sport, dport, ip_packet)
+    next if opts[:ignore_arp] && protocol == "arp"
+    next if opts[:ignore_sources].include?(eth_packet.eth_saddr)
 
     packet_info = {
       mac_saddr: eth_packet.eth_saddr,

features/support/helpers/sniffing_helper.rb

@@ -21,7 +21,7 @@ class Sniffer
     @pcap_file = "#{$config["TMPDIR"]}/#{pcap_name}"
   end
 
-  def capture(filter="not ether src host #{@vmnet.bridge_mac} and not ether proto \\arp and not ether proto \\rarp")
+  def capture
     job = IO.popen(
       [
         "/usr/sbin/tcpdump",
@@ -30,7 +30,6 @@ class Sniffer
         "--immediate-mode",
         "-i", @vmnet.bridge_name,
         "-w", @pcap_file,
-        filter,
         :err => ["/dev/null", "w"]
       ]
     )