summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am6
-rw-r--r--debian/changelog5
2 files changed, 5 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index ce970826..990cba46 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,8 +5,6 @@ curverdir = $(sysconfdir)/config-migrate/current
gentmpdir = generated-templates
checkparamsonrebootdir = $(bindir)/sudo-users/check-params-on-reboot.d
initddir = /etc/init.d
-netplugupdir = /etc/netplug/linkup.d
-netplugdowndir = /etc/netplug/linkdown.d
modprobedir = /etc/modprobe.d
modprobe_DATA = etc/modprobe.d/no-copybreak.conf
@@ -24,10 +22,6 @@ initd_SCRIPTS += etc/init.d/ec2-vyos-init
initd_SCRIPTS += etc/init.d/vyatta-config-reboot-params
checkparamsonreboot_SCRIPTS += scripts/check-params-on-reboot.d/ipv6_disable_blacklist
-
-netplugup_SCRIPTS = scripts/netplug/linkup/dhclient
-netplugdown_SCRIPTS = scripts/netplug/linkdown/dhclient
-
bin_SCRIPTS += scripts/progress-indicator
bin_SCRIPTS += scripts/vyatta-functions
bin_SCRIPTS += scripts/restricted-shell
diff --git a/debian/changelog b/debian/changelog
index 00c15b91..4f4d5fda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,8 @@
+vyatta-cfg-system (0.20.44+vyos2+current19) unstable; urgency=low
+
+ * linkdown.d and linkup.d scripts moved into vyos-netplug
+
+ -- hagbard <vyosdev@derith.de> Thu, 17 Jan 2019 11:51:42 -0800
vyatta-cfg-system (0.20.44+vyos2+current18) unstable; urgency=low
* T1181 dhclient not restarted if interface switches from disable to enabled again