matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[pmon] Add smartmontools to pmon docker (#11837)

Browse Source 
* Add smartmontools to pmon docker

* Set smartmontools to install version 7.2-1 in pmon to match host; clean up smartmontools build files

* Add comments on smartmontools version for both host and pmon
This commit is contained in:
cytsao1 2022-10-17 13:26:31 -07:00 committed by GitHub
parent 7ba1d25757
commit 9ef8464964
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dockers/docker-platform-monitor/Dockerfile.j2
View File

@ -26,7 +26,9 @@ RUN apt-get update && \
psmisc \ psmisc \
python3-jsonschema \ python3-jsonschema \
libpci3 \ libpci3 \
iputils-ping iputils-ping \
# smartmontools version should match the installed smartmontools in sonic_debian_extension build template
smartmontools=7.2-1
# On Arista devices, the sonic_platform wheel is not installed in the container. # On Arista devices, the sonic_platform wheel is not installed in the container.
# Instead, the installation directory is mounted from the host OS. However, this method # Instead, the installation directory is mounted from the host OS. However, this method

2
files/build_templates/sonic_debian_extension.j2
View File

@ -344,7 +344,7 @@ sudo chmod 755 $FILESYSTEM_ROOT/usr/bin/memory_checker
sudo cp $IMAGE_CONFIGS/monit/restart_service $FILESYSTEM_ROOT/usr/bin/ sudo cp $IMAGE_CONFIGS/monit/restart_service $FILESYSTEM_ROOT/usr/bin/
sudo chmod 755 $FILESYSTEM_ROOT/usr/bin/restart_service sudo chmod 755 $FILESYSTEM_ROOT/usr/bin/restart_service
# Install custom-built smartmontools # Installed smartmontools version should match installed smartmontools in docker-platform-monitor Dockerfile
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install smartmontools=7.2-1 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install smartmontools=7.2-1
# Install custom-built openssh sshd # Install custom-built openssh sshd

10
rules/smartmontools.dep
View File

@ -1,10 +0,0 @@
SPATH := $($(SMARTMONTOOLS)_SRC_PATH)
DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/smartmontools.mk rules/smartmontools.dep
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
DEP_FILES += $(shell git ls-files $(SPATH))
$(SMARTMONTOOLS)_CACHE_MODE := GIT_CONTENT_SHA
$(SMARTMONTOOLS)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
$(SMARTMONTOOLS)_DEP_FILES := $(DEP_FILES)

12
rules/smartmontools.mk
View File

@ -1,12 +0,0 @@
# smartmontools package
#
SMARTMONTOOLS_VERSION_MAJOR = 6.6
SMARTMONTOOLS_VERSION_FULL = $(SMARTMONTOOLS_VERSION_MAJOR)-1
export SMARTMONTOOLS_VERSION_MAJOR SMARTMONTOOLS_VERSION_FULL
SMARTMONTOOLS = smartmontools_$(SMARTMONTOOLS_VERSION_FULL)_$(CONFIGURED_ARCH).deb
$(SMARTMONTOOLS)_SRC_PATH = $(SRC_PATH)/smartmontools
SONIC_MAKE_DEBS += $(SMARTMONTOOLS)