diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2023-11-09 20:18:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-09 20:18:03 +0200 |
| commit | 1f4e9bc3860e4829fe35ecfcbf32d9d4eb00f777 (patch) | |
| tree | 3fa6bf2b6b1a9aef244a305e88457700ab75b263 | |
| parent | e308e98496c4f897bbb7cc1d3651039a00d196de (diff) | |
| parent | e10cf9f42514799d10b9c495d585bb9f41fd2330 (diff) | |
| download | vyos-1x-1f4e9bc3860e4829fe35ecfcbf32d9d4eb00f777.tar.gz vyos-1x-1f4e9bc3860e4829fe35ecfcbf32d9d4eb00f777.zip | |
Merge pull request #2464 from sever-sever/T1797
T1797: Remove vpp packages and mentions
| -rw-r--r-- | debian/control | 7 | ||||
| -rw-r--r-- | debian/vyos-1x.preinst | 1 | ||||
| -rw-r--r-- | op-mode-definitions/monitor-log.xml.in | 6 | ||||
| -rw-r--r-- | op-mode-definitions/show-log.xml.in | 6 |
4 files changed, 0 insertions, 20 deletions
diff --git a/debian/control b/debian/control index d2ed3991a..98c064417 100644 --- a/debian/control +++ b/debian/control @@ -295,13 +295,6 @@ Depends: # For "run monitor bandwidth" bmon, # End Operational mode -## VPP - vpp [amd64], - vpp-plugin-core [amd64], - vpp-plugin-dpdk [amd64], - python3-vpp-api [amd64], - libvppinfra [amd64], -## End VPP ## Optional utilities easy-rsa, tcptraceroute, diff --git a/debian/vyos-1x.preinst b/debian/vyos-1x.preinst index 08f48cac2..fbfc85566 100644 --- a/debian/vyos-1x.preinst +++ b/debian/vyos-1x.preinst @@ -5,7 +5,6 @@ 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 diff --git a/op-mode-definitions/monitor-log.xml.in b/op-mode-definitions/monitor-log.xml.in index ee066b39b..44628a112 100644 --- a/op-mode-definitions/monitor-log.xml.in +++ b/op-mode-definitions/monitor-log.xml.in @@ -341,12 +341,6 @@ </tagNode> </children> </node> - <leafNode name="vpp"> - <properties> - <help>Monitor last lines of Vector Packet Processor log</help> - </properties> - <command>journalctl --no-hostname --boot --follow --unit vpp.service</command> - </leafNode> <leafNode name="vrrp"> <properties> <help>Monitor last lines of Virtual Router Redundancy Protocol log</help> diff --git a/op-mode-definitions/show-log.xml.in b/op-mode-definitions/show-log.xml.in index 39d69c64e..3a622cfb5 100644 --- a/op-mode-definitions/show-log.xml.in +++ b/op-mode-definitions/show-log.xml.in @@ -700,12 +700,6 @@ </tagNode> </children> </node> - <leafNode name="vpp"> - <properties> - <help>Show log for Vector Packet Processor (VPP)</help> - </properties> - <command>journalctl --no-hostname --boot --unit vpp.service</command> - </leafNode> <leafNode name="vrrp"> <properties> <help>Show log for Virtual Router Redundancy Protocol (VRRP)</help> |