summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
-rw-r--r--debian/control120
-rw-r--r--debian/copyright76
-rw-r--r--debian/libvyosconfig0.install2
-rw-r--r--debian/libvyosconfig0.links5
-rw-r--r--debian/libvyosconfig0.postinst3
-rwxr-xr-xdebian/rules74
-rw-r--r--debian/vyos-1x-aws.install3
-rw-r--r--debian/vyos-1x-smoketest.install3
-rw-r--r--debian/vyos-1x.install4
-rw-r--r--debian/vyos-1x.links4
-rw-r--r--debian/vyos-1x.postinst20
-rw-r--r--debian/vyos-1x.preinst3
13 files changed, 245 insertions, 76 deletions
diff --git a/debian/changelog b/debian/changelog
index d64c66818..c9fed1f82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-vyos-1x (1.5dev0) unstable; urgency=medium
+vyos-1x (999.0) unstable; urgency=medium
* Dummy changelog entry for vyos-1x repository
This is a internal VyOS package and the VyOS package process does not use
the debian package changelog for its changes, please refer to the
GitHub commitlog and the vyos release-notes for more details.
- The correct verion number of this package is auto-generated by GIT
+ The correct version number of this package is auto-generated by GIT
on build-time
-- VyOS maintainers and contributors <maintainers@vyos.io> Sun, 10 Sep 2023 15:42:53 +0200
diff --git a/debian/control b/debian/control
index 4186dfb3b..3e2b41ca6 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,20 @@ Build-Depends:
iproute2,
libzmq3-dev,
python3 (>= 3.10),
-# For QA
+# For libvyosconfig
+ libpcre2-dev,
+ libffi-dev,
+# For QA/Lint
pylint,
+ python3-vici (>= 5.7.2),
+ python3-fastapi,
+ python3-pyudev,
+ python3-systemd,
+ python3-certbot-nginx,
+ python3-pam,
+ python3-dbus,
+ python3-pyroute2,
+ python3-voluptuous,
# For generating command definitions
python3-lxml,
python3-xmltodict,
@@ -22,7 +34,7 @@ Build-Depends:
python3-hurry.filesize,
python3-netaddr,
python3-netifaces,
- python3-nose,
+ python3-nose2,
python3-jinja2,
python3-paramiko,
python3-passlib,
@@ -38,11 +50,11 @@ Standards-Version: 3.9.6
Package: vyos-1x
Architecture: amd64 arm64
Pre-Depends:
- libpam-runtime [amd64],
- libnss-tacplus [amd64],
- libpam-tacplus [amd64],
- libpam-radius-auth (= 1.5.0-cl3u7) [amd64],
- libnss-mapuser (= 1.1.0-cl3u3) [amd64],
+ libpam-runtime,
+ libnss-tacplus,
+ libpam-tacplus,
+ vyos-libpam-radius-auth,
+ vyos-libnss-mapuser,
tzdata (>= 2025b)
Depends:
## Fundamentals
@@ -60,7 +72,6 @@ Depends:
vyatta-biosdevname,
vyatta-cfg,
vyos-http-api-tools,
- vyos-utils,
## End of Fundamentals
## Python libraries used in multiple modules and scripts
python3,
@@ -80,6 +91,7 @@ Depends:
python3-pystache,
python3-pyudev,
python3-six,
+ python3-systemd,
python3-tabulate,
python3-tomli,
python3-voluptuous,
@@ -97,12 +109,13 @@ Depends:
file,
iproute2 (>= 6.0.0),
linux-cpupower,
+ hwloc,
+ kexec-tools,
# ipaddrcheck is widely used in IP value validators
ipaddrcheck,
ethtool (>= 6.10),
lm-sensors,
procps,
- netplug,
sed,
ssl-cert,
tuned,
@@ -120,9 +133,9 @@ Depends:
dosfstools,
grub-efi-amd64-signed [amd64],
grub-efi-arm64-bin [arm64],
- mokutil [amd64],
+ mokutil,
shim-signed [amd64],
- sbsigntool [amd64],
+ sbsigntool,
# Image signature verification tool
minisign,
# Live filesystem tools
@@ -136,7 +149,7 @@ Depends:
iputils-ping,
isc-dhcp-client,
# For "vpn pptp", "vpn l2tp", "vpn sstp", "service ipoe-server"
- accel-ppp,
+ accel-ppp-ng,
# End "vpn pptp", "vpn l2tp", "vpn sstp", "service ipoe-server"
avahi-daemon,
conntrack,
@@ -159,7 +172,6 @@ Depends:
openvpn-auth-ldap,
openvpn-auth-radius,
openvpn-otp,
- openvpn-dco,
libpam-google-authenticator,
# End "interfaces openvpn"
# For "interfaces wireguard"
@@ -190,13 +202,10 @@ Depends:
console-data,
dropbear,
# End "service console-server"
-# For "service aws glb"
- aws-gwlbtun,
# For "service dns dynamic"
ddclient (>= 3.11.1),
# End "service dns dynamic"
# # For "service ids"
- fastnetmon [amd64],
suricata,
suricata-update,
# End "service ids"
@@ -204,7 +213,7 @@ Depends:
ndppd,
# End "service ndp-proxy"
# For "service router-advert"
- radvd,
+ radvd (>= 2.20),
# End "service route-advert"
# For "load-balancing haproxy"
haproxy,
@@ -212,7 +221,10 @@ Depends:
# For "service dhcp-relay"
isc-dhcp-relay,
# For "service dhcp-server"
- kea,
+ isc-kea-dhcp4,
+ isc-kea-dhcp6,
+ isc-kea-dhcp-ddns,
+ isc-kea-hooks,
# End "service dhcp-server"
# For "service lldp"
lldpd,
@@ -312,11 +324,9 @@ Depends:
# For "vpn openconnect"
ocserv,
# End "vpn openconnect"
-# For "system flow-accounting"
- pmacct (>= 1.6.0),
-# End "system flow-accounting"
# For "system syslog"
rsyslog,
+ rsyslog-openssl,
# End "system syslog"
# For "system option keyboard-layout"
kbd,
@@ -332,6 +342,7 @@ Depends:
libvppinfra,
python3-vpp-api,
vpp,
+ vpp-crypto-engines,
vpp-dev,
vpp-plugin-core,
vpp-plugin-dpdk,
@@ -347,6 +358,8 @@ Depends:
# End "run monitor traffic"
# For "show hardware dmi"
dmidecode,
+# For "show protocols static arp"
+ net-tools,
# For "run show hardware storage smart"
smartmontools,
# For "run show hardware scsi"
@@ -361,6 +374,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"
@@ -385,18 +400,69 @@ Depends:
Description: VyOS configuration scripts and data
VyOS configuration scripts, interface definitions, and everything
+Package: libvyosconfig0
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Description: VyConf config tree manipulation library
+ VyConf config tree parsing and manipulation library
+
+Package: vyos-1x-aws
+Architecture: all
+Depends:
+ vyos-1x,
+# For "service aws glb"
+ aws-gwlbtun,
+Description: VyOS configuration scripts and data for AWS Gateway Load Balancer
+ Adds configuration files required for AWS Gateway Load Balancer service
+ running on top of VyOS.
+
+Package: vyos-1x-smoketest
+Architecture: all
+Depends:
+ skopeo,
+ vyos-1x,
+ vmtouch
+Description: VyOS build sanity checking toolkit
+
Package: vyos-1x-vmware
-Architecture: amd64
+Architecture: all
Depends:
vyos-1x,
open-vm-tools
Description: VyOS configuration scripts and data for VMware
Adds configuration files required for VyOS running on VMware hosts.
-Package: vyos-1x-smoketest
+Package: vyos-user-utils
Architecture: all
Depends:
- skopeo,
- snmp,
- vyos-1x
-Description: VyOS build sanity checking toolkit
+ 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.
diff --git a/debian/copyright b/debian/copyright
index 20704c47c..33b963f86 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,33 +3,57 @@ Thu, 17 Aug 2017 20:17:04 -0400
It's original content from the GIT repository <http://github.com/vyos/vyos-1x>
-Upstream Author:
-
+Upstream Author:
<maintainers@vyos.net>
-Copyright:
-
- Copyright (C) 2017 VyOS maintainers and contributors
+Copyright:
+ Copyright VyOS Networks <maintainers@vyos.io>
All Rights Reserved.
-License:
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
-
-A copy of the GNU General Public License is available as
-`/usr/share/common-licenses/GPL' in the Debian GNU/Linux distribution
-or on the World Wide Web at `http://www.gnu.org/copyleft/gpl.html'.
-You can also obtain it by writing to the Free Software Foundation,
-Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-MA 02110-1301, USA.
-
-The Debian packaging is (C) 2017, Daniil Baturin <daniil@baturin.org> and
-is licensed under the GPL, see above.
+Files: *
+Copyright: VyOS Networks
+License: GPL-2+
+
+Files: python/vyos/config.py
+ python/vyos/configsession.py
+ python/vyos/configtree.py
+ python/vyos/opmode.py
+Copyright: VyOS Networks
+License: LGPL-2.1+
+
+
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ A copy of the GNU General Public License is available as
+ `/usr/share/common-licenses/GPL' in the Debian GNU/Linux distribution
+ or on the World Wide Web at `http://www.gnu.org/copyleft/gpl.html'.
+ You can also obtain it by writing to the Free Software Foundation,
+ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+
+License: LGPL-2.1+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1, or (at your option)
+ any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License along
+ with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License version 2.1 can be found in ‘/usr/share/common-licenses/LGPL-2.1’.
diff --git a/debian/libvyosconfig0.install b/debian/libvyosconfig0.install
new file mode 100644
index 000000000..db337b486
--- /dev/null
+++ b/debian/libvyosconfig0.install
@@ -0,0 +1,2 @@
+libvyosconfig/usr/* /usr
+libvyosconfig/etc/* /etc
diff --git a/debian/libvyosconfig0.links b/debian/libvyosconfig0.links
new file mode 100644
index 000000000..6ab3b4274
--- /dev/null
+++ b/debian/libvyosconfig0.links
@@ -0,0 +1,5 @@
+/usr/libexec/vyos/vyconf/vyconf_cli /usr/libexec/vyos/vyconf/bin/vy_set
+/usr/libexec/vyos/vyconf/vyconf_cli /usr/libexec/vyos/vyconf/bin/vy_delete
+/usr/libexec/vyos/vyconf/vyconf_cli /usr/libexec/vyos/vyconf/bin/vy_discard
+/usr/libexec/vyos/vyconf/vyconf_cli /usr/libexec/vyos/vyconf/bin/vy_copy
+/usr/libexec/vyos/vyconf/vyconf_cli /usr/libexec/vyos/vyconf/bin/vy_rename
diff --git a/debian/libvyosconfig0.postinst b/debian/libvyosconfig0.postinst
new file mode 100644
index 000000000..93efa1c89
--- /dev/null
+++ b/debian/libvyosconfig0.postinst
@@ -0,0 +1,3 @@
+ldconfig
+chown -R root:vyattacfg /usr/libexec/vyos/vyconf/session
+chmod -R 775 /usr/libexec/vyos/vyconf/session
diff --git a/debian/rules b/debian/rules
index f579ffec9..332a32ecf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,29 @@
#!/usr/bin/make -f
DIR := debian/tmp
+DIR_AWS := $(DIR)/vyos-1x-aws
+DIR_LIBVYOSCONFIG := $(DIR)/libvyosconfig
VYOS_SBIN_DIR := usr/sbin
VYOS_BIN_DIR := usr/bin
+VYOS_LIB_DIR := usr/lib
VYOS_LIBEXEC_DIR := usr/libexec/vyos
VYOS_DATA_DIR := usr/share/vyos
VYOS_CFG_TMPL_DIR := opt/vyatta/share/vyatta-cfg/templates
VYOS_OP_TMPL_DIR := opt/vyatta/share/vyatta-op/templates
VYOS_MIBS_DIR := usr/share/snmp/mibs
VYOS_LOCALUI_DIR := srv/localui
+
+VYCONF := usr/libexec/vyos/vyconf
+VYCONF_BIN := $(VYCONF)/bin
+VYCONF_CONF := $(VYCONF)/config
+VYCONF_SESSION := $(VYCONF)/session
+VYCONF_DATA := usr/share/vyos/vyconf
+VYCONF_DEF := etc/vyos
VYCONF_REFTREE_DIR := $(VYOS_LIBEXEC_DIR)/vyconf/reftree
+OCAML_DIR := /opt/opam/${OCAML_VERSION}
+VYOS_OCAML_TOOLS := src/ocaml/_build/install/default/bin
+
MIGRATION_SCRIPTS_DIR := opt/vyatta/etc/config-migrate/migrate
ACTIVATION_SCRIPTS_DIR := usr/libexec/vyos/activate
SYSTEM_SCRIPTS_DIR := usr/libexec/vyos/system
@@ -18,6 +31,12 @@ SERVICES_DIR := usr/libexec/vyos/services
DEB_TARGET_ARCH := $(shell dpkg-architecture -qDEB_TARGET_ARCH)
+# Base version prefix from debian/changelog
+BASE_VERSION := 999.0
+COMMIT_ID := $(shell echo -n g && git rev-parse --short HEAD)
+COMMIT_COUNT := $(shell git rev-list HEAD --count)
+DIRTY_FLAG := $(shell ! git diff --quiet || ! git diff --cached --quiet && echo -dirty || echo)
+
%:
dh $@ --with python3, --with quilt
@@ -26,7 +45,7 @@ DEB_TARGET_ARCH := $(shell dpkg-architecture -qDEB_TARGET_ARCH)
override_dh_strip_nondeterminism:
override_dh_gencontrol:
- dh_gencontrol -- -v$(shell (git describe --tags --long --match 'vyos/*' --match '1.4.*' --dirty 2>/dev/null || echo 0.0-no.git.tag) | sed -E 's%vyos/%%' | sed -E 's%-dirty%+dirty%')
+ dh_gencontrol -- -v$(BASE_VERSION)-$(COMMIT_COUNT)-$(COMMIT_ID)$(DIRTY_FLAG)
override_dh_auto_build:
make all
@@ -36,6 +55,9 @@ override_dh_auto_install:
cd python; python3 setup.py install --install-layout=deb --root ../$(DIR); cd ..
+ # Remove all __pycache__ directories before installing
+ find . -type d -name '__pycache__' -exec rm -rf {} +
+
# Install scripts
mkdir -p $(DIR)/$(VYOS_SBIN_DIR)
mkdir -p $(DIR)/$(VYOS_BIN_DIR)
@@ -128,20 +150,54 @@ override_dh_auto_install:
cp -r smoketest/scripts/* $(DIR)/$(VYOS_LIBEXEC_DIR)/tests/smoke
# Install smoke test configs
- mkdir -p $(DIR)/$(VYOS_LIBEXEC_DIR)/tests/config/
- cp -r smoketest/configs/* $(DIR)/$(VYOS_LIBEXEC_DIR)/tests/config
-
- # Install smoke test config tests
- mkdir -p $(DIR)/$(VYOS_LIBEXEC_DIR)/tests/config-tests/
- cp -r smoketest/config-tests/* $(DIR)/$(VYOS_LIBEXEC_DIR)/tests/config-tests
+ mkdir -p $(DIR)/$(VYOS_LIBEXEC_DIR)/tests/configs/
+ cp -r smoketest/configs/* $(DIR)/$(VYOS_LIBEXEC_DIR)/tests/configs
# Install system programs
mkdir -p $(DIR)/$(VYOS_BIN_DIR)
cp -r smoketest/bin/* $(DIR)/$(VYOS_BIN_DIR)
- # Install udev script
+ # Install udev scripts
mkdir -p $(DIR)/usr/lib/udev
- cp src/helpers/vyos_net_name $(DIR)/usr/lib/udev
+ cp -r src/udev/* $(DIR)/usr/lib/udev
+
+ # vyos-1x-aws package
+ # Move some files to dedicated DEB packages
+ #
+ mkdir -p $(DIR_AWS)/lib/systemd/system
+ mv $(DIR)/lib/systemd/system/aws-gwlbtun.service $(DIR_AWS)/lib/systemd/system
+
+ mkdir -p $(DIR_AWS)/opt/vyatta/share/vyatta-cfg/templates/service
+ mv $(DIR)/opt/vyatta/share/vyatta-cfg/templates/service/aws $(DIR_AWS)/opt/vyatta/share/vyatta-cfg/templates/service
+
+ mkdir -p $(DIR_AWS)/usr/libexec/vyos/conf_mode
+ mv $(DIR)/usr/libexec/vyos/conf_mode/service_aws_glb.py $(DIR_AWS)/usr/libexec/vyos/conf_mode
+
+ mkdir -p $(DIR_AWS)/usr/share/vyos/templates
+ mv $(DIR)/usr/share/vyos/templates/aws/ $(DIR_AWS)/usr/share/vyos/templates
+
+ # libvyosconfig package
+ mkdir -p $(DIR_LIBVYOSCONFIG)/$(VYOS_LIB_DIR)
+ mkdir -p $(DIR_LIBVYOSCONFIG)/$(VYCONF_CONF)
+ mkdir -p $(DIR_LIBVYOSCONFIG)/$(VYCONF_SESSION)
+ mkdir -p $(DIR_LIBVYOSCONFIG)/$(VYCONF_DATA)
+ mkdir -p $(DIR_LIBVYOSCONFIG)/$(VYCONF_DEF)
+ mkdir -p $(DIR_LIBVYOSCONFIG)/$(VYCONF_BIN)
+
+ cp $(OCAML_DIR)/share/vyconf/vyconf.proto $(DIR_LIBVYOSCONFIG)/$(VYCONF_DATA)
+ cp $(OCAML_DIR)/share/vyconf/vyconfd.conf $(DIR_LIBVYOSCONFIG)/$(VYCONF_DEF)
+ cp $(OCAML_DIR)/bin/vyconfd $(DIR_LIBVYOSCONFIG)/$(VYCONF)
+ cp $(OCAML_DIR)/bin/vyconf_cli $(DIR_LIBVYOSCONFIG)/$(VYCONF)
+ cp $(OCAML_DIR)/bin/vyconf_cli_compat $(DIR_LIBVYOSCONFIG)/$(VYCONF_BIN)
+ cp libvyosconfig/_build/libvyosconfig.so $(DIR_LIBVYOSCONFIG)/$(VYOS_LIB_DIR)/libvyosconfig.so.0
+
+ # OCaml binaries from former vyos-utils package
+ cp $(VYOS_OCAML_TOOLS)/numeric $(DIR)/$(VYOS_LIBEXEC_DIR)/validators
+ cp $(VYOS_OCAML_TOOLS)/validate-value $(DIR)/$(VYOS_LIBEXEC_DIR)
+ cp $(VYOS_OCAML_TOOLS)/file-path $(DIR)/$(VYOS_LIBEXEC_DIR)/validators
+ cp $(VYOS_OCAML_TOOLS)/url $(DIR)/$(VYOS_LIBEXEC_DIR)/validators
+ cp $(VYOS_OCAML_TOOLS)/list_interfaces $(DIR)/$(VYOS_LIBEXEC_DIR)/completion
+ cp $(VYOS_OCAML_TOOLS)/vyos-op-run $(DIR)/$(VYOS_BIN_DIR)
override_dh_installsystemd:
dh_installsystemd -pvyos-1x --name vyos-router vyos-router.service
diff --git a/debian/vyos-1x-aws.install b/debian/vyos-1x-aws.install
new file mode 100644
index 000000000..57a9d29f9
--- /dev/null
+++ b/debian/vyos-1x-aws.install
@@ -0,0 +1,3 @@
+vyos-1x-aws/lib/* /lib
+vyos-1x-aws/opt/* /opt
+vyos-1x-aws/usr/* /usr
diff --git a/debian/vyos-1x-smoketest.install b/debian/vyos-1x-smoketest.install
index 739cb189b..cadfb98dc 100644
--- a/debian/vyos-1x-smoketest.install
+++ b/debian/vyos-1x-smoketest.install
@@ -2,5 +2,4 @@ usr/bin/vyos-smoketest
usr/bin/vyos-configtest
usr/bin/vyos-configtest-pki
usr/libexec/vyos/tests/smoke
-usr/libexec/vyos/tests/config
-usr/libexec/vyos/tests/config-tests
+usr/libexec/vyos/tests/configs
diff --git a/debian/vyos-1x.install b/debian/vyos-1x.install
index 4e312a648..55369aebe 100644
--- a/debian/vyos-1x.install
+++ b/debian/vyos-1x.install
@@ -5,8 +5,6 @@ etc/default
etc/dhcp
etc/ipsec.d
etc/logrotate.d
-etc/netplug
-etc/opennhrp
etc/modprobe.d
etc/ppp
etc/securetty
@@ -31,6 +29,7 @@ usr/bin/vyos-config-to-commands
usr/bin/vyos-config-to-json
usr/bin/vyos-commands-to-config
usr/bin/vyos-hostsd-client
+usr/bin/vyos-op-run
usr/lib
usr/libexec/vyos/activate
usr/libexec/vyos/completion
@@ -40,6 +39,7 @@ usr/libexec/vyos/op_mode
usr/libexec/vyos/services
usr/libexec/vyos/system
usr/libexec/vyos/validators
+usr/libexec/vyos/validate-value
usr/libexec/vyos/vyconf
usr/libexec/vyos/*.py
usr/libexec/vyos/*.sh
diff --git a/debian/vyos-1x.links b/debian/vyos-1x.links
index 7e21f294c..f410f428c 100644
--- a/debian/vyos-1x.links
+++ b/debian/vyos-1x.links
@@ -1,3 +1,3 @@
-/etc/netplug/linkup.d/vyos-python-helper /etc/netplug/linkdown.d/vyos-python-helper
/usr/libexec/vyos/system/standalone_root_pw_reset /opt/vyatta/sbin/standalone_root_pw_reset
-/lib/systemd/system/rsyslog.service /etc/systemd/system/syslog.service
+/usr/libexec/vyos/vyconf_cli.py /usr/libexec/vyos/vyconf/bin/vy_commit
+/usr/libexec/vyos/vyconf_cli.py /usr/libexec/vyos/vyconf/bin/vy_in_session
diff --git a/debian/vyos-1x.postinst b/debian/vyos-1x.postinst
index fde58651a..4ca20d8e3 100644
--- a/debian/vyos-1x.postinst
+++ b/debian/vyos-1x.postinst
@@ -50,6 +50,10 @@ if [[ -e /usr/share/pam-configs/tacplus ]]; then
rm /usr/share/pam-configs/tacplus
fi
+# Disable pam_nologin.so behavior for regular users
+sed -i '/^auth[[:space:]]\+requisite[[:space:]]\+pam_nologin\.so$/s/^/#/' /etc/pam.d/login
+sed -i '/^account[[:space:]]\+required[[:space:]]\+pam_nologin\.so$/s/^/#/' /etc/pam.d/sshd
+
# Add TACACS system users required for TACACS based system authentication
if ! grep -q '^tacacs' /etc/passwd; then
# Add the tacacs group and all 16 possible tacacs privilege-level users to
@@ -77,6 +81,7 @@ if ! grep -q '^tacacs' /etc/passwd; then
adduser --quiet tacacs${level} disk
adduser --quiet tacacs${level} frr
adduser --quiet tacacs${level} _kea
+ adduser --quiet tacacs${level} vpp
fi
level=$(( level+1 ))
done 2>&1 | grep -v "User tacacs${level} already exists"
@@ -109,6 +114,7 @@ if ! grep -q '^radius_priv_user' /etc/passwd; then
adduser --quiet radius_priv_user users
adduser --quiet radius_priv_user frr
adduser --quiet radius_priv_user _kea
+ adduser --quiet radius_priv_user vpp
fi
# add hostsd group for vyos-hostsd
@@ -150,6 +156,11 @@ chmod -R 775 /opt/vyatta/etc/config
mkdir -p /opt/vyatta/etc/logrotate
mkdir -p /opt/vyatta/etc/netdevice.d
+# T8326: GeoIP permissions
+mkdir -p /var/cache/vyos /usr/share/vyos-geoip
+chown -R root:vyattacfg /var/cache/vyos /usr/share/vyos-geoip
+chmod -R 775 /var/cache/vyos /usr/share/vyos-geoip
+
touch /etc/environment
if [ ! -f /etc/bash_completion ]; then
@@ -220,12 +231,8 @@ fi
# Remove unwanted daemon files from /etc
# conntackd
-# pmacct
-# fastnetmon
# ntp
DELETE="/etc/logrotate.d/conntrackd.distrib /etc/init.d/conntrackd /etc/default/conntrackd
- /etc/default/pmacctd /etc/pmacct
- /etc/networks_list /etc/networks_whitelist /etc/fastnetmon.conf
/etc/ntp.conf /etc/default/ssh /etc/avahi/avahi-daemon.conf /etc/avahi/hosts
/etc/powerdns /etc/default/pdns-recursor
/etc/ppp/ip-up.d/0000usepeerdns /etc/ppp/ip-down.d/0000usepeerdns"
@@ -276,3 +283,8 @@ fi
if systemctl is-active --quiet vyos-domain-resolver; then
systemctl restart vyos-domain-resolver
fi
+
+# Restart vyos-netlinkd if running
+if systemctl is-active --quiet vyos-netlinkd; then
+ systemctl restart vyos-netlinkd
+fi
diff --git a/debian/vyos-1x.preinst b/debian/vyos-1x.preinst
index 08f48cac2..d39cf7544 100644
--- a/debian/vyos-1x.preinst
+++ b/debian/vyos-1x.preinst
@@ -6,7 +6,6 @@ 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
-dpkg-divert --package vyos-1x --add --no-rename /etc/netplug/netplugd.conf
-dpkg-divert --package vyos-1x --add --no-rename /etc/netplug/netplug
dpkg-divert --package vyos-1x --add --no-rename /etc/rsyslog.d/45-frr.conf
dpkg-divert --package vyos-1x --add --no-rename /lib/udev/rules.d/99-systemd.rules
+dpkg-divert --package vyos-1x --add --no-rename /etc/cron.d/certbot
generated by cgit v1.2.3 (git 2.39.1) at 2026-09-12 11:26:44 +0000