diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD index e524022d5..437cb7d0b 100644 --- a/archlinux/PKGBUILD +++ b/archlinux/PKGBUILD @@ -35,7 +35,6 @@ build() { done # Fix for network tools paths - sed 's:/sbin/ethtool:ethtool:g' -i network/* sed 's:/sbin/ip:ip:g' -i network/* sed 's:/bin/grep:grep:g' -i network/* @@ -61,7 +60,7 @@ package_qubes-vm-core() { release=${BASH_REMATCH[1]}.${BASH_REMATCH[2]} # temporarily pretend it is still R4.1, until repository for R4.2 is created release=4.1 - depends=(qubes-vm-utils python python-xdg ethtool ntp iproute2 + depends=(qubes-vm-utils python python-xdg ntp iproute2 gnome-packagekit imagemagick fakeroot notification-daemon dconf zenity qubes-libvchan qubes-db-vm haveged python-gobject python-dbus xdg-utils notification-daemon gawk sed procps-ng librsvg @@ -119,7 +118,7 @@ EOF # package_qubes-vm-networking() { pkgdesc="Qubes OS tools allowing to use a Qubes VM as a NetVM/ProxyVM" - depends=(qubes-vm-core qubes-vm-utils python ethtool iproute2 + depends=(qubes-vm-core qubes-vm-utils python iproute2 qubes-db-vm networkmanager iptables tinyproxy nftables conntrack-tools ) diff --git a/debian/control b/debian/control index 952245b26..0c8b90c6a 100644 --- a/debian/control +++ b/debian/control @@ -126,7 +126,6 @@ Depends: qubes-core-agent (= ${binary:Version}), tinyproxy, iptables, - ethtool, conntrack, socat, tinyproxy, diff --git a/network/setup-ip b/network/setup-ip index a51dd8ad9..4ff1956ab 100755 --- a/network/setup-ip +++ b/network/setup-ip @@ -214,9 +214,6 @@ if [ "$ACTION" == "add" ]; then secondary_dns=$(/usr/bin/qubesdb-read /qubes-secondary-dns 2>/dev/null) || secondary_dns= if [ -n "$ip" ]; then - /sbin/ethtool -K "$INTERFACE" sg off - /sbin/ethtool -K "$INTERFACE" tx off - # If NetworkManager is enabled, let it configure the network if qsvc network-manager && [ -e /usr/bin/nmcli ]; then configure_network_nm "$MAC" "$INTERFACE" "$ip" "$ip6" "$netmask" "$netmask6" "$gateway" "$gateway6" "$primary_dns" "$secondary_dns" diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in index 11869ad0e..af82f2a10 100644 --- a/rpm_spec/core-agent.spec.in +++ b/rpm_spec/core-agent.spec.in @@ -239,7 +239,6 @@ Scripts required to handle dom0 updates. %package networking Summary: Networking support for Qubes VM -Requires: ethtool Requires: iptables Requires: conntrack-tools Requires: iproute diff --git a/vm-init.d/qubes-firewall b/vm-init.d/qubes-firewall index 3df596068..0519ee9de 100755 --- a/vm-init.d/qubes-firewall +++ b/vm-init.d/qubes-firewall @@ -19,7 +19,6 @@ start() if qsvc qubes-firewall ; then echo -n $"Starting Qubes Firewall monitor:" - /sbin/ethtool -K "$(get_qubes_managed_iface)" sg off /usr/bin/qubes-firewall & success echo "" diff --git a/vm-systemd/network-proxy-setup.sh b/vm-systemd/network-proxy-setup.sh index c8e547a83..0e20b4f59 100755 --- a/vm-systemd/network-proxy-setup.sh +++ b/vm-systemd/network-proxy-setup.sh @@ -28,5 +28,4 @@ if [ "x$network" != "x" ]; then if [ -n "$gateway6" ]; then echo 1 > /proc/sys/net/ipv6/conf/all/forwarding fi - /sbin/ethtool -K "$(get_qubes_managed_iface)" sg off || true fi