diff options
Diffstat (limited to 'build-root')
| -rw-r--r-- | build-root/deb/debian/control | 8 | ||||
| -rw-r--r-- | build-root/deb/debian/vpp-bin.README.Debian | 2 | ||||
| -rw-r--r-- | build-root/deb/debian/vpp.upstart | 2 | ||||
| -rw-r--r-- | build-root/rpm/vpp.service | 2 | ||||
| -rw-r--r-- | build-root/rpm/vpp.spec | 10 |
5 files changed, 12 insertions, 12 deletions
diff --git a/build-root/deb/debian/control b/build-root/deb/debian/control index 0278286af9d..a90cea76ea2 100644 --- a/build-root/deb/debian/control +++ b/build-root/deb/debian/control @@ -9,10 +9,10 @@ Package: vpp Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Vector Packet Processing--executables - This package provides VPP executables: vpe, vpe_api_test, vpe_json_test - vpe - the vector packet engine - vpe_api_test - vector packet engine API test tool - vpe_json_test - vector packet engine JSON test tool + This package provides VPP executables: vpp, vpp_api_test, vpp_json_test + vpp - the vector packet engine + vpp_api_test - vector packet engine API test tool + vpp_json_test - vector packet engine JSON test tool Package: vpp-dbg Architecture: any diff --git a/build-root/deb/debian/vpp-bin.README.Debian b/build-root/deb/debian/vpp-bin.README.Debian index 25ecd38ef66..192289696ef 100644 --- a/build-root/deb/debian/vpp-bin.README.Debian +++ b/build-root/deb/debian/vpp-bin.README.Debian @@ -1,6 +1,6 @@ To run vpp with the debug shell: -sudo vpe unix interactive +sudo vpp unix interactive which will result in a prompt that looks like: diff --git a/build-root/deb/debian/vpp.upstart b/build-root/deb/debian/vpp.upstart index ec731d896f5..c0ff09e2c16 100644 --- a/build-root/deb/debian/vpp.upstart +++ b/build-root/deb/debian/vpp.upstart @@ -13,7 +13,7 @@ end script script - exec vpe $(cat /etc/vpp/startup.conf | sed -e 's/#.*//') + exec vpp -c /etc/vpp/startup.conf end script post-stop script diff --git a/build-root/rpm/vpp.service b/build-root/rpm/vpp.service index dd8ee36bd73..fc66b15ccbc 100644 --- a/build-root/rpm/vpp.service +++ b/build-root/rpm/vpp.service @@ -3,7 +3,7 @@ Description=Vector Packet Processing Process After=syslog.target network.target auditd.service [Service] -ExecStart=/bin/sh -c '/usr/bin/vpe $(cat /etc/vpp/startup.conf | sed -e "s/#.*//")' +ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf Type=simple Restart=on-failure RestartSec=5s diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec index ddcdeb9f1ab..fbadf07c3ae 100644 --- a/build-root/rpm/vpp.spec +++ b/build-root/rpm/vpp.spec @@ -14,10 +14,10 @@ Release: %{_release} Requires: vpp-lib = %{_version}-%{_release}, net-tools, pciutils %description -This package provides VPP executables: vpe, vpe_api_test, vpe_json_test -vpe - the vector packet engine -vpe_api_test - vector packet engine API test tool -vpe_json_test - vector packet engine JSON test tool +This package provides VPP executables: vpp, vpp_api_test, vpp_json_test +vpp - the vector packet engine +vpp_api_test - vector packet engine API test tool +vpp_json_test - vector packet engine JSON test tool %package lib Summary: VPP libraries @@ -111,7 +111,7 @@ sysctl --system %files %defattr(-,bin,bin) %{_unitdir}/vpp.service -/usr/bin/vpe* +/usr/bin/vpp* /usr/bin/svm* %config /etc/sysctl.d/80-vpp.conf %config /etc/vpp/startup.conf |