diff options
| author | Daniil Baturin <daniil@baturin.org> | 2019-08-15 21:12:36 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2019-08-15 21:12:36 +0200 |
| commit | cbd558b0825081f664259c4802e9ca3a9ba3859d (patch) | |
| tree | 3e97fe81f66560306f71cf1bc87ba04918dff576 /scripts | |
| parent | 51ecaf7842e8bf35544fbbe5f245410cf83d78ed (diff) | |
| parent | 2a3b22afdbc8de630cc82178f7a7984eb0e2d3f8 (diff) | |
| download | vyatta-cfg-system-cbd558b0825081f664259c4802e9ca3a9ba3859d.tar.gz vyatta-cfg-system-cbd558b0825081f664259c4802e9ca3a9ba3859d.zip | |
Merge branch 'equuleus' of https://github.com/vyos/vyatta-cfg-system into equuleus
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/vyatta-grub-setup | 2 | ||||
| -rwxr-xr-x | scripts/vyatta-interfaces.pl | 4 |
2 files changed, 4 insertions, 2 deletions
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 }' \ 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"; |