3 files changed, 25 insertions, 9 deletions
diff --git a/debian/control b/debian/control
index 8e9aaa702..ee45a5fe3 100644
--- a/debian/control
+++ b/debian/control
@@ -91,7 +91,7 @@ Depends:
   libqmi-utils,
   libstrongswan-extra-plugins (>=5.9),
   libstrongswan-standard-plugins (>=5.9),
-  libvppinfra,
+  libvppinfra [amd64],
   libvyosconfig0,
   linux-cpupower,
   lldpd,
@@ -145,7 +145,7 @@ Depends:
   python3-tabulate,
   python3-vici (>= 5.7.2),
   python3-voluptuous,
-  python3-vpp-api,
+  python3-vpp-api [amd64],
   python3-xmltodict,
   python3-zmq,
   qrencode,
@@ -180,9 +180,9 @@ Depends:
   uidmap,
   usb-modeswitch,
   usbutils,
-  vpp,
-  vpp-plugin-core,
-  vpp-plugin-dpdk,
+  vpp [amd64],
+  vpp-plugin-core [amd64],
+  vpp-plugin-dpdk [amd64],
   vyatta-bash,
   vyatta-cfg,
   vyos-http-api-tools,
@@ -191,6 +191,7 @@ Depends:
   wireguard-tools,
   wireless-regdb,
   wpasupplicant (>= 0.6.7),
+  zabbix-agent2,
   ndppd,
   miniupnpd-nftables
 Description: VyOS configuration scripts and data
diff --git a/debian/rules b/debian/rules
index 9ada2bf87..e6bbeeafb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,9 +32,6 @@ override_dh_auto_build:
 override_dh_auto_install:
 	dh_auto_install
 
-	# convert the XML to dictionaries
-	env PYTHONPATH=python python3 python/vyos/xml/generate.py
-
 	cd python; python3 setup.py install --install-layout=deb --root ../$(DIR); cd ..
 
 	# Install scripts
diff --git a/debian/vyos-1x.postinst b/debian/vyos-1x.postinst
index 93e7ced9b..f3dc00b46 100644
--- a/debian/vyos-1x.postinst
+++ b/debian/vyos-1x.postinst
@@ -120,9 +120,24 @@ if ! grep -q '^dhcpd' /etc/passwd; then
     adduser --quiet dhcpd hostsd
 fi
 
-# ensure hte proxy user has a proper shell
+# ensure the proxy user has a proper shell
 chsh -s /bin/sh proxy
 
+# create /opt/vyatta/etc/config/scripts/vyos-preconfig-bootup.script
+PRECONFIG_SCRIPT=/opt/vyatta/etc/config/scripts/vyos-preconfig-bootup.script
+if [ ! -x $PRECONFIG_SCRIPT ]; then
+    mkdir -p $(dirname $PRECONFIG_SCRIPT)
+    touch $PRECONFIG_SCRIPT
+    chmod 755 $PRECONFIG_SCRIPT
+    cat <<EOF >>$PRECONFIG_SCRIPT
+#!/bin/sh
+# This script is executed at boot time before VyOS configuration is applied.
+# Any modifications required to work around unfixed bugs or use
+# services not available through the VyOS CLI system can be placed here.
+
+EOF
+fi
+
 # create /opt/vyatta/etc/config/scripts/vyos-postconfig-bootup.script
 POSTCONFIG_SCRIPT=/opt/vyatta/etc/config/scripts/vyos-postconfig-bootup.script
 if [ ! -x $POSTCONFIG_SCRIPT ]; then
@@ -180,6 +195,9 @@ systemctl enable vyos-config-cloud-init.service
 # Generate API GraphQL schema
 /usr/libexec/vyos/services/api/graphql/generate/generate_schema.py
 
+# Update XML cache
+python3 /usr/lib/python3/dist-packages/vyos/xml_ref/update_cache.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: