diff options
17 files changed, 66 insertions, 20 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 1f14c36e..4f4d5fda 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,26 @@ +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 + + -- hagbard <vyosdev@derith.de> Tue, 15 Jan 2019 12:19:16 -0800 + +vyatta-cfg-system (0.20.44+vyos2+current17) unstable; urgency=low + + * T1026 - Removing tunnel deletes all tunnels? + + -- hagbard <vyosdev@derith.de> Mon, 07 Jan 2019 14:24:33 -0800 + vyatta-cfg-system (0.20.44+vyos2+current16) unstable; urgency=low * T1053 - Error when re-configuring an interface from DHCP to static IP -- hagbard <vyosdev@derith.de> Thu, 29 Nov 2018 14:26:07 -0800 + vyatta-cfg-system (0.20.44+vyos2+current15) unstable; urgency=medium * Virtio network card, no info (maybe not fully supported?) diff --git a/scripts/system/vyatta_update_console.pl b/scripts/system/vyatta_update_console.pl index ff7c2df1..79ad3617 100755 --- a/scripts/system/vyatta_update_console.pl +++ b/scripts/system/vyatta_update_console.pl @@ -102,6 +102,8 @@ sub update_getty{ system("systemctl daemon-reload"); if ( system("systemctl status serial-getty\@$tty.service 2>&1 > /dev/null")) { system("systemctl start serial-getty\@$tty.service"); + } else { + system("/bin/stty -F /dev/$tty $speed cstopb"); } } } diff --git a/scripts/system/vyatta_update_sysctl.pl b/scripts/system/vyatta_update_sysctl.pl index 6e33c5d0..adc84178 100644 --- a/scripts/system/vyatta_update_sysctl.pl +++ b/scripts/system/vyatta_update_sysctl.pl @@ -51,18 +51,19 @@ EOF } GetOptions( - "option=s{2}" => \@opts, + "option=s{2,}" => \@opts, ) or usage(); set_sysctl_value(@opts) if (@opts); exit 0; sub set_sysctl_value { - my ($sysctl_opt, $nvalue) = @_; + my ($sysctl_opt, @nvaluearr) = @_; + my $nvalue = join ' ',@nvaluearr; my $ovalue = get_sysctl_value($sysctl_opt); if ($nvalue ne $ovalue) { - my $cmd = "$SYSCTL -w $sysctl_opt=$nvalue 2>&1> /dev/null"; + my $cmd = "$SYSCTL -w $sysctl_opt=\"$nvalue\" 2>&1> /dev/null"; system($cmd); if ($? >> 8) { die "exec of $SYSCTL failed: '$cmd'"; diff --git a/scripts/vyatta-grub-setup b/scripts/vyatta-grub-setup index 995b5c8a..8f0734ed 100755 --- a/scripts/vyatta-grub-setup +++ b/scripts/vyatta-grub-setup @@ -154,6 +154,7 @@ fi # set serial console options echo -e "serial --unit=0 --speed=9600" echo "terminal_output --append serial" + echo "terminal_input serial console" # EFI needs a few extra modules if [ -d /sys/firmware/efi ]; then diff --git a/scripts/vyatta-tunnel-cleanup b/scripts/vyatta-tunnel-cleanup index 979fb7bd..b8a93244 100755 --- a/scripts/vyatta-tunnel-cleanup +++ b/scripts/vyatta-tunnel-cleanup @@ -28,13 +28,3 @@ foreach my $tun ( $config->listEffectiveNodes() ) { next if ($interface eq $tun); # don't count the one being deleted $tunnel{$mode} = 1; } - -foreach my $type ( keys %encapsulation ) { - # skip if tunnel is still in use - next if $tunnel{$type}; - - my $module = $encapsulation{$type}; - next unless ( -d "/sys/module/$module" ); - system("sudo /sbin/rmmod $module") == 0 - or warn "rmmod $module failed\n"; -} diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/mac/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/mac/node.def new file mode 100644 index 00000000..750710ec --- /dev/null +++ b/templates/interfaces/bonding/node.tag/vif-s/node.tag/mac/node.def @@ -0,0 +1,4 @@ +type: macaddr +help: Media Access Control (MAC) address + +update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../../@).$VAR(../@) --set-mac $VAR(@) diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/mac/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/mac/node.def new file mode 100644 index 00000000..24b4b4d7 --- /dev/null +++ b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/mac/node.def @@ -0,0 +1,4 @@ +type: macaddr +help: Media Access Control (MAC) address + +update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../../../@).$VAR(../../@).$VAR(../@) --set-mac $VAR(@) diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/mac/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/mac/node.def new file mode 100644 index 00000000..750710ec --- /dev/null +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/mac/node.def @@ -0,0 +1,4 @@ +type: macaddr +help: Media Access Control (MAC) address + +update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../../@).$VAR(../@) --set-mac $VAR(@) diff --git a/templates/interfaces/ethernet/node.tag/disable/node.def b/templates/interfaces/ethernet/node.tag/disable/node.def index c948e970..418fe24c 100644 --- a/templates/interfaces/ethernet/node.tag/disable/node.def +++ b/templates/interfaces/ethernet/node.tag/disable/node.def @@ -14,3 +14,7 @@ delete: [ -d /sys/class/net/$VAR(../@) ] || exit 0 fi affinity=$VAR(../smp-affinity/@) sudo /opt/vyatta/sbin/irq-affinity.pl $VAR(../@) ${affinity:-auto} + s=$(cli-shell-api showCfg interfaces ethernet $VAR(../@) address | awk '{print $2}') + if [ "$s" == "dhcp" ]; then + /etc/netplug/linkup.d/dhclient $VAR(../@) + fi diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/mac/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/mac/node.def new file mode 100644 index 00000000..750710ec --- /dev/null +++ b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/mac/node.def @@ -0,0 +1,4 @@ +type: macaddr +help: Media Access Control (MAC) address + +update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../../@).$VAR(../@) --set-mac $VAR(@) diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/mac/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/mac/node.def new file mode 100644 index 00000000..24b4b4d7 --- /dev/null +++ b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/mac/node.def @@ -0,0 +1,4 @@ +type: macaddr +help: Media Access Control (MAC) address + +update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../../../@).$VAR(../../@).$VAR(../@) --set-mac $VAR(@) diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/mac/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/mac/node.def new file mode 100644 index 00000000..750710ec --- /dev/null +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/mac/node.def @@ -0,0 +1,4 @@ +type: macaddr +help: Media Access Control (MAC) address + +update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../../@).$VAR(../@) --set-mac $VAR(@) diff --git a/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/mac/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/mac/node.def new file mode 100644 index 00000000..750710ec --- /dev/null +++ b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/mac/node.def @@ -0,0 +1,4 @@ +type: macaddr +help: Media Access Control (MAC) address + +update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../../@).$VAR(../@) --set-mac $VAR(@) diff --git a/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/mac/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/mac/node.def new file mode 100644 index 00000000..24b4b4d7 --- /dev/null +++ b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/mac/node.def @@ -0,0 +1,4 @@ +type: macaddr +help: Media Access Control (MAC) address + +update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../../../@).$VAR(../../@).$VAR(../@) --set-mac $VAR(@) diff --git a/templates/interfaces/pseudo-ethernet/node.tag/vif/node.tag/mac/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif/node.tag/mac/node.def new file mode 100644 index 00000000..750710ec --- /dev/null +++ b/templates/interfaces/pseudo-ethernet/node.tag/vif/node.tag/mac/node.def @@ -0,0 +1,4 @@ +type: macaddr +help: Media Access Control (MAC) address + +update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../../@).$VAR(../@) --set-mac $VAR(@) diff --git a/templates/system/console/device/node.tag/speed/node.def b/templates/system/console/device/node.tag/speed/node.def index 3a117301..6f270821 100644 --- a/templates/system/console/device/node.tag/speed/node.def +++ b/templates/system/console/device/node.tag/speed/node.def @@ -1,5 +1,5 @@ type: u32 -help: Console baud rate. New rate will take effect on reboot. +help: Console baud rate. allowed: echo 1200 2400 4800 9600 19200 38400 57600 115200 syntax:expression: $VAR(@) in 1200, 2400, 4800, 9600, 19200, 38400, \ 57600, 115200 ; "unknown baud rate" |