summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build-root/rpm/vpp.service2
-rw-r--r--build-root/rpm/vpp.spec2
-rw-r--r--vpp/conf/startup.uiopcigeneric.conf14
3 files changed, 17 insertions, 1 deletions
diff --git a/build-root/rpm/vpp.service b/build-root/rpm/vpp.service
index fc66b15c..40bf9d48 100644
--- a/build-root/rpm/vpp.service
+++ b/build-root/rpm/vpp.service
@@ -3,6 +3,8 @@ Description=Vector Packet Processing Process
After=syslog.target network.target auditd.service
[Service]
+ExecStartPre=-/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api
+ExecStartPre=-/sbin/modprobe uio_pci_generic
ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf
Type=simple
Restart=on-failure
diff --git a/build-root/rpm/vpp.spec b/build-root/rpm/vpp.spec
index 85b1286c..2513041b 100644
--- a/build-root/rpm/vpp.spec
+++ b/build-root/rpm/vpp.spec
@@ -63,7 +63,7 @@ install -p -m 755 %{_vpp_build_dir}/vppapigen/vppapigen %{buildroot}%{_bindir}
mkdir -p -m755 %{buildroot}/etc/vpp
mkdir -p -m755 %{buildroot}/etc/sysctl.d
install -p -m 644 vpp.service %{buildroot}%{_unitdir}
-install -p -m 644 ../../vpp/conf/startup.conf %{buildroot}/etc/vpp
+install -p -m 644 ../../vpp/conf/startup.uiopcigeneric.conf %{buildroot}/etc/vpp/startup.conf
install -p -m 644 ../../vpp/conf/80-vpp.conf %{buildroot}/etc/sysctl.d
#
# libraries
diff --git a/vpp/conf/startup.uiopcigeneric.conf b/vpp/conf/startup.uiopcigeneric.conf
new file mode 100644
index 00000000..69bdb716
--- /dev/null
+++ b/vpp/conf/startup.uiopcigeneric.conf
@@ -0,0 +1,14 @@
+
+unix {
+ nodaemon
+ log /tmp/vpp.log
+ full-coredump
+}
+
+dpdk {
+ uio-driver uio_pci_generic
+}
+
+api-trace {
+ on
+}