diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-04-19 20:46:50 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2026-04-19 20:50:41 +0200 |
| commit | f3a21109778fea1f3c2d7ab1afa0c5e0f75483a8 (patch) | |
| tree | 2c79044fa15d6c0c62d115327254b1f9089c9032 /debian | |
| parent | 67b68bd9893ad3a39af53ceee856ce5c61ed0638 (diff) | |
| parent | 1fd60b557ea15a9129829d7e8a9395c9b656012a (diff) | |
| download | vyos-1x-f3a21109778fea1f3c2d7ab1afa0c5e0f75483a8.tar.gz vyos-1x-f3a21109778fea1f3c2d7ab1afa0c5e0f75483a8.zip | |
Merge branch 'current' of github.com:vyos/vyos-utils into vyos-utils-merge
* 'current' of github.com:vyos/vyos-utils: (65 commits)
T8269: add option to silence output of individual validators
T8306: update package version
vyos-op-run: T8306: add error messages for system exceptions
vyos-op-run: T8306: improve execution logic logging
vyos-op-run: T8301: improve the security of UID check and setuid logic
T8110: "list_interfaces --bondable" must not return VLAN subinterfaces
vyos-op-run: T7901: skip permission checks if the user is root
vyos-op-run: T8005: sanitize environment variables to prevent malicious variable injection
T7878: conflict check updated to use mergify
T7878: conflict check updated to use mergify
T7899: virtual-ethernet interfaces support broadcasts
Debian: T7899: bump dh compat version
T7758: add missing case to allow repeated option --type
T7758: allow repeated option --type in list_interfaces
vyos-op-run: T7745: add a command permission checking mechanism
op-mode: T7583: add a new operational command runner
T7644: mirror workflow refactoring rollout
T7579: fix of the run trigger for CLA
T7579: added workflow for CLA
validators: T6622: Radix-aware numeric validation
...
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 1 | ||||
| -rwxr-xr-x | debian/rules | 9 | ||||
| -rw-r--r-- | debian/vyos-1x.install | 1 |
3 files changed, 10 insertions, 1 deletions
diff --git a/debian/control b/debian/control index a98d0bd34..ba059ae0b 100644 --- a/debian/control +++ b/debian/control @@ -72,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, diff --git a/debian/rules b/debian/rules index 9649a6a36..7e554010a 100755 --- a/debian/rules +++ b/debian/rules @@ -22,6 +22,7 @@ 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 @@ -190,6 +191,14 @@ override_dh_auto_install: 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)/validators + 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 dh_installsystemd -pvyos-1x --name vyos vyos.target diff --git a/debian/vyos-1x.install b/debian/vyos-1x.install index 7732cc039..41fd77839 100644 --- a/debian/vyos-1x.install +++ b/debian/vyos-1x.install @@ -29,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 |