diff options
| author | Daniil Baturin <daniil@baturin.org> | 2019-07-22 11:08:08 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2019-07-22 11:08:08 +0200 |
| commit | 6af7b74e2b80b014a80c0c8531b7e219194a9d92 (patch) | |
| tree | 2fc50e087eb759ecc9a73dbc486d537d651c200c /debian | |
| parent | b050fe61956f710e61d8e3a8139c971a23e702f9 (diff) | |
| parent | d99bf6a3a623433e743bb2d1d72e2ef3e0ab5057 (diff) | |
| download | vyos-1x-6af7b74e2b80b014a80c0c8531b7e219194a9d92.tar.gz vyos-1x-6af7b74e2b80b014a80c0c8531b7e219194a9d92.zip | |
Merge branch 'current' into equuleus
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 1 | ||||
| -rwxr-xr-x | debian/rules | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/debian/control b/debian/control index bf213352e..c8946e991 100644 --- a/debian/control +++ b/debian/control @@ -27,6 +27,7 @@ Depends: python3, python3-isc-dhcp-leases, python3-hurry.filesize, python3-vici (>= 5.7.2), + python3-bottle, ipaddrcheck, tcpdump, tshark, diff --git a/debian/rules b/debian/rules index ff2d205ba..952867a76 100755 --- a/debian/rules +++ b/debian/rules @@ -10,6 +10,7 @@ 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 +SERVICES_DIR := usr/libexec/vyos/services %: dh $@ --with python3, --with quilt @@ -53,6 +54,10 @@ override_dh_auto_install: mkdir -p $(DIR)/$(SYSTEM_SCRIPTS_DIR) cp -r src/system/* $(DIR)/$(SYSTEM_SCRIPTS_DIR) + # Install system services + mkdir -p $(DIR)/$(SERVICES_DIR) + cp -r src/services/* $(DIR)/$(SERVICES_DIR) + # Install configuration command definitions mkdir -p $(DIR)/$(VYOS_CFG_TMPL_DIR) cp -r templates-cfg/* $(DIR)/$(VYOS_CFG_TMPL_DIR) @@ -72,3 +77,6 @@ override_dh_auto_install: # Install systemd service units mkdir -p $(DIR)/lib/systemd/system cp -r src/systemd/* $(DIR)/lib/systemd/system + + # Make directory for generated configuration file + mkdir -p $(DIR)/etc/vyos |