[master][ethtool] Install ethtool to localhost (#18241)

Signed-off-by: mlok <marty.lok@nokia.com>
sonic-net · May 18, 2024 · 1fd869b · 1fd869b
1 parent 2fb29d3
commit 1fd869b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/build_debian.sh b/build_debian.sh
@@ -406,6 +406,7 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     sysstat                 \
     xxd                     \
     wireless-regdb          \
+    ethtool                 \
     zstd                    \
     nvme-cli
 

diff --git a/dockers/docker-platform-monitor/Dockerfile.j2 b/dockers/docker-platform-monitor/Dockerfile.j2
@@ -27,9 +27,10 @@ RUN apt-get update &&   \
         iputils-ping    \
         pciutils        \
         nvme-cli        \
-        ethtool &&	\
+        ethtool
+
 # smartmontools version should match the installed smartmontools in sonic_debian_extension build template
-    apt-get install -y -t bookworm-backports \
+RUN apt-get install -y -t bookworm-backports \
         smartmontools
 
 # On Arista devices, the sonic_platform wheel is not installed in the container.

diff --git a/rules/docker-platform-monitor.mk b/rules/docker-platform-monitor.mk
@@ -65,7 +65,6 @@ $(DOCKER_PLATFORM_MONITOR)_aboot_RUN_OPT += -v /usr/lib/python3/dist-packages/so
 $(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/bin/sensors
 $(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/iSmart
 $(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/SmartCmd
-$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/bin/ethtool
 $(DOCKER_PLATFORM_MONITOR)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
 
 SONIC_BOOKWORM_DOCKERS += $(DOCKER_PLATFORM_MONITOR)