diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-07-30 00:33:13 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-30 00:33:13 +0700 |
| commit | 08016dc01b83dd3a3a1be3350a8e5669fee9db14 (patch) | |
| tree | 9367200cde712f8b2167ca1f3c4c91426474cc63 /debian | |
| parent | 0fdfe533cd2bad844b1c0cd98c62a7e1866c481c (diff) | |
| parent | 1c0b7ede177e97c4b4e6ad5e9e13bec56f233bb5 (diff) | |
| download | vyos-1x-08016dc01b83dd3a3a1be3350a8e5669fee9db14.tar.gz vyos-1x-08016dc01b83dd3a3a1be3350a8e5669fee9db14.zip | |
Merge branch 'current' into current
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 5 |
3 files changed, 12 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 84836fb29..e8519e87a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyos-1x (1.2.0-1) unstable; urgency=medium + + * T666, T616: new implementation of the VRRP CLI. + + -- Daniil Baturin <daniil@baturin.org> Fri, 27 Jul 2018 10:25:52 +0200 + vyos-1x (1.0.6) unstable; urgency=medium * T736: Rewrite remote logging (syslog) to XML/Python diff --git a/debian/control b/debian/control index 8a6bf3da6..c87e7452c 100644 --- a/debian/control +++ b/debian/control @@ -35,7 +35,7 @@ Depends: python3, iputils-arping, libvyosconfig0, beep, - keepalived, + keepalived (>=2.0.5), ${shlibs:Depends}, ${misc:Depends} Description: VyOS configuration scripts and data diff --git a/debian/rules b/debian/rules index d284471ec..15dfec551 100755 --- a/debian/rules +++ b/debian/rules @@ -9,6 +9,7 @@ VYOS_CFG_TMPL_DIR := /opt/vyatta/share/vyatta-cfg/templates VYOS_OP_TMPL_DIR := /opt/vyatta/share/vyatta-op/templates MIGRATION_SCRIPTS_DIR := /opt/vyatta/etc/config-migrate/migrate/ +SYSTEM_SCRIPTS_DIR := usr/libexec/vyos/system %: dh $@ --with python3, --with quilt @@ -48,6 +49,10 @@ override_dh_auto_install: mkdir -p $(DIR)/$(MIGRATION_SCRIPTS_DIR) cp -r src/migration-scripts/* $(DIR)/$(MIGRATION_SCRIPTS_DIR) + # Install system scripts + mkdir -p $(DIR)/$(SYSTEM_SCRIPTS_DIR) + cp -r src/system/* $(DIR)/$(SYSTEM_SCRIPTS_DIR) + # Install configuration command definitions mkdir -p $(DIR)/$(VYOS_CFG_TMPL_DIR) cp -r templates-cfg/* $(DIR)/$(VYOS_CFG_TMPL_DIR) |