From 7d259935b08927a2649544448ee8c66da832b8fc Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Wed, 31 Jul 2019 09:21:53 -0500 Subject: T1553: add 'noautologin' to boot parameters Debian live-config (>= 5.0) will set the default to 'autologin' when booting in live mode, unless explicitly set. --- scripts/vyatta-grub-setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/vyatta-grub-setup b/scripts/vyatta-grub-setup index de67ba60..bc2c653c 100755 --- a/scripts/vyatta-grub-setup +++ b/scripts/vyatta-grub-setup @@ -103,7 +103,7 @@ else fi if eval "$UNION"; then - GRUB_OPTIONS="boot=live quiet rootdelay=5 vyos-union=/boot/$livedir" + GRUB_OPTIONS="boot=live quiet rootdelay=5 noautologin vyos-union=/boot/$livedir" union_xen_kernel_version=$(ls $ROOTFSDIR/boot/$livedir/vmlinuz*-xen* \ 2>/dev/null \ | awk -F/ '{ print $6 }' \ -- cgit v1.2.3 From 7d83de0511f90274582716fe30fba5c44c07270f Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Wed, 31 Jul 2019 21:09:57 +0200 Subject: T1381: add dhclient config options for option 121 classless routes. --- scripts/vyatta-interfaces.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/vyatta-interfaces.pl b/scripts/vyatta-interfaces.pl index f6fa717a..91e48d96 100755 --- a/scripts/vyatta-interfaces.pl +++ b/scripts/vyatta-interfaces.pl @@ -182,6 +182,8 @@ sub dhcp_update_config { $hostname = get_hostname(); } + $output .= "option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"; + $output .= "interface \"$intf\" {\n"; if (defined($hostname)) { $output .= "\tsend host-name \"$hostname\";\n"; @@ -192,7 +194,7 @@ sub dhcp_update_config { $output .= "\tsend dhcp-client-identifier \"$client_id\";\n"; } - $output .= "\trequest subnet-mask, broadcast-address, routers, domain-name-servers"; + $output .= "\trequest subnet-mask, broadcast-address, routers, domain-name-servers, rfc3442-classless-static-routes"; my $domainname = is_domain_name_set(); if (!defined($domainname)) { $output .= ", domain-name"; -- cgit v1.2.3