3 files changed, 18 insertions, 3 deletions
diff --git a/debian/control b/debian/control
index dcce8036a..40920cadc 100644
--- a/debian/control
+++ b/debian/control
@@ -27,9 +27,9 @@ Standards-Version: 3.9.6
 Package: vyos-1x
 Architecture: amd64 arm64
 Pre-Depends:
-  libnss-tacplus (>= 1.0.4),
-  libpam-tacplus (>= 1.4.3),
-  libpam-radius-auth (>= 1.5.0)
+  libnss-tacplus [amd64],
+  libpam-tacplus [amd64],
+  libpam-radius-auth [amd64]
 Depends:
   ${python3:Depends} (>= 3.10),
   aardvark-dns,
@@ -90,6 +90,7 @@ Depends:
   libqmi-utils,
   libstrongswan-extra-plugins (>=5.9),
   libstrongswan-standard-plugins (>=5.9),
+  libvppinfra,
   libvyosconfig0,
   lldpd,
   lm-sensors,
@@ -142,6 +143,7 @@ Depends:
   python3-tabulate,
   python3-vici (>= 5.7.2),
   python3-voluptuous,
+  python3-vpp-api,
   python3-xmltodict,
   python3-zmq,
   qrencode,
@@ -176,6 +178,9 @@ Depends:
   uidmap,
   usb-modeswitch,
   usbutils,
+  vpp,
+  vpp-plugin-core,
+  vpp-plugin-dpdk,
   vyatta-bash,
   vyatta-cfg,
   vyos-http-api-tools,
diff --git a/debian/vyos-1x.postinst b/debian/vyos-1x.postinst
index 9822ce286..2958afd0a 100644
--- a/debian/vyos-1x.postinst
+++ b/debian/vyos-1x.postinst
@@ -179,3 +179,12 @@ systemctl enable vyos-config-cloud-init.service
 
 # Generate API GraphQL schema
 /usr/libexec/vyos/services/api/graphql/generate/generate_schema.py
+
+# T1797: disable VPP support for rolling release, should be used by developers
+# only (in the initial phase). If you wan't to enable VPP use the below command
+# on your VyOS installation:
+#
+# sudo mv /opt/vyatta/share/vyatta-cfg/vpp /opt/vyatta/share/vyatta-cfg/templates/vpp
+if [ -d /opt/vyatta/share/vyatta-cfg/templates/vpp ]; then
+    mv /opt/vyatta/share/vyatta-cfg/templates/vpp /opt/vyatta/share/vyatta-cfg/vpp
+fi
diff --git a/debian/vyos-1x.preinst b/debian/vyos-1x.preinst
index bfbeb112c..92037a915 100644
--- a/debian/vyos-1x.preinst
+++ b/debian/vyos-1x.preinst
@@ -7,3 +7,4 @@ dpkg-divert --package vyos-1x --add --no-rename /usr/share/pam-configs/tacplus
 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