Merge pull request #5099 from c-po/user-utils

T8449: Merge vyos-user-utils package into vyos-1x

2 files changed, 37 insertions, 1 deletions

diff --git a/.gitignore b/.gitignore
index c277fd29c..06ae0c0db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -120,6 +120,7 @@ debian/vyos-1x
 debian/vyos-1x-vmware
 debian/vyos-1x-smoketest
 debian/vyos-1x-aws
+debian/vyos-user-utils
 debian/*.postinst.debhelper
 debian/*.prerm.debhelper
 debian/*.postrm.debhelper
diff --git a/debian/control b/debian/control
index f9998a90e..545341eae 100644
--- a/debian/control
+++ b/debian/control
@@ -376,6 +376,8 @@ Depends:
   iperf,
   iperf3,
 # End "run monitor bandwidth-test"
+# For "run reset openvpn client"
+  socat,
 # For "run wake-on-lan"
   etherwake,
 # For "run force ipv6-nd"
@@ -421,7 +423,6 @@ Package: vyos-1x-smoketest
 Architecture: all
 Depends:
  skopeo,
- snmp,
  vyos-1x,
  vmtouch
 Description: VyOS build sanity checking toolkit
@@ -433,3 +434,37 @@ Depends:
  open-vm-tools
 Description: VyOS configuration scripts and data for VMware
  Adds configuration files required for VyOS running on VMware hosts.
+
+Package: vyos-user-utils
+Architecture: all
+Depends:
+  aptitude,
+  arpwatch,
+  atop,
+  bgpq3,
+  dnsdist,
+  dnsutils,
+  exfat-fuse,
+  exfatprogs,
+  fancontrol,
+  grepcidr,
+  haveged,
+  htop,
+  iftop,
+  iotop,
+  ipcalc,
+  ipmitool,
+  jq,
+  libnss-myhostname,
+  localepurge,
+  lsof,
+  minicom,
+  nano,
+  netcat-openbsd,
+  nmap,
+  numactl,
+  openssh-client,
+  screen,
+  sipcalc
+Description: VyOS user utilities metapackage
+ Installs utilities that are provided for the users but not used by VyOS scripts.