vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #824 from jestabro/vyconf-minimal

Browse Source 
T6718: use the vyconf daemon for validation of set commands
This commit is contained in:
Daniil Baturin 2024-12-06 21:37:58 +00:00 committed by GitHub
commit 15c0bd7578
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/live-build-config/hooks/live/18-enable-disable_services.chroot
View File

@ -68,6 +68,7 @@ systemctl disable dpkg-db-backup.timer
systemctl disable dpkg-db-backup.service systemctl disable dpkg-db-backup.service
systemctl disable zabbix-agent2.service systemctl disable zabbix-agent2.service
systemctl disable suricata.service systemctl disable suricata.service
systemctl disable vyconfd.service
echo I: Enabling services echo I: Enabling services
systemctl enable vyos-hostsd.service systemctl enable vyos-hostsd.service

6
docker/Dockerfile
View File

@ -153,10 +153,6 @@ RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \
fileutils \ fileutils \
xml-light xml-light
# Build VyConf which is required to build libvyosconfig
RUN eval $(opam env --root=/opt/opam --set-root) && \
opam pin add vyos1x-config https://github.com/vyos/vyos1x-config.git#d7260e772e39bc6a3a2d76d629567e03bbad16b5 -y
# Packages needed for libvyosconfig # Packages needed for libvyosconfig
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
quilt \ quilt \
@ -166,7 +162,7 @@ RUN apt-get update && apt-get install -y \
# Build libvyosconfig # Build libvyosconfig
RUN eval $(opam env --root=/opt/opam --set-root) && \ RUN eval $(opam env --root=/opt/opam --set-root) && \
git clone https://github.com/vyos/libvyosconfig.git /tmp/libvyosconfig && \ git clone https://github.com/vyos/libvyosconfig.git /tmp/libvyosconfig && \
cd /tmp/libvyosconfig && git checkout 9e4f6c1494fcff64ad22503b704dbdd43347b0a6 && \ cd /tmp/libvyosconfig && git checkout 2b979d7fc25793e5be29376a4951375c0bf328d9 && \
dpkg-buildpackage -uc -us -tc -b && \ dpkg-buildpackage -uc -us -tc -b && \
dpkg -i /tmp/libvyosconfig0_*_$(dpkg-architecture -qDEB_HOST_ARCH).deb dpkg -i /tmp/libvyosconfig0_*_$(dpkg-architecture -qDEB_HOST_ARCH).deb