diff options
| author | Robert <rgingras@mieweb.com> | 2025-02-10 10:51:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-10 10:51:12 -0500 |
| commit | f400eec4f40a814baba82f8a6d5755bdfd69f120 (patch) | |
| tree | 729d57c54de53bc7d2f97d436496dd636d5b4045 /debian | |
| parent | a24d2f87fdde466625d9b6173657f07cf4401f30 (diff) | |
| parent | 41e9b8b362faedc0c20316255d59d7f90e848a4c (diff) | |
| download | vyos-1x-f400eec4f40a814baba82f8a6d5755bdfd69f120.tar.gz vyos-1x-f400eec4f40a814baba82f8a6d5755bdfd69f120.zip | |
Merge branch 'current' into T7095_vrf-fix
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 8 | ||||
| -rw-r--r-- | debian/vyos-1x.install | 1 | ||||
| -rw-r--r-- | debian/vyos-1x.preinst | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/debian/control b/debian/control index 76fe5c331..57709ea24 100644 --- a/debian/control +++ b/debian/control @@ -325,6 +325,14 @@ Depends: # iptables is only used for containers now, not the the firewall CLI iptables, # End container +# For "vpp" + libvppinfra, + python3-vpp-api, + vpp, + vpp-dev, + vpp-plugin-core, + vpp-plugin-dpdk, +# End "vpp" ## End Configuration mode ## Operational mode # Used for hypervisor model in "run show version" diff --git a/debian/vyos-1x.install b/debian/vyos-1x.install index 5fcff959a..4e312a648 100644 --- a/debian/vyos-1x.install +++ b/debian/vyos-1x.install @@ -9,7 +9,6 @@ etc/netplug etc/opennhrp etc/modprobe.d etc/ppp -etc/rsyslog.conf etc/securetty etc/security etc/skel diff --git a/debian/vyos-1x.preinst b/debian/vyos-1x.preinst index fbfc85566..08f48cac2 100644 --- a/debian/vyos-1x.preinst +++ b/debian/vyos-1x.preinst @@ -5,6 +5,7 @@ dpkg-divert --package vyos-1x --add --no-rename /etc/logrotate.d/conntrackd dpkg-divert --package vyos-1x --add --no-rename /etc/rsyslog.conf dpkg-divert --package vyos-1x --add --no-rename /etc/skel/.bashrc dpkg-divert --package vyos-1x --add --no-rename /etc/skel/.profile +dpkg-divert --package vyos-1x --add --no-rename /etc/sysctl.d/80-vpp.conf dpkg-divert --package vyos-1x --add --no-rename /etc/netplug/netplugd.conf dpkg-divert --package vyos-1x --add --no-rename /etc/netplug/netplug dpkg-divert --package vyos-1x --add --no-rename /etc/rsyslog.d/45-frr.conf |