diff options
| author | Rick Balocca <rbalocca@vyatta.com> | 2008-08-06 14:46:50 -0700 |
|---|---|---|
| committer | Rick Balocca <rbalocca@vyatta.com> | 2008-08-06 14:46:50 -0700 |
| commit | b07c0515451f5f429ef10ee2cfc4472ca452a9a9 (patch) | |
| tree | f30552e4c6b0b584f6c2ff81cd38ae539d5612c7 /scripts | |
| parent | b439500cbaae43279d6cfb536b765775922829a8 (diff) | |
| parent | 5249053c47fd72a36870c2195eefabc7915b92e5 (diff) | |
| download | vyatta-cfg-quagga-b07c0515451f5f429ef10ee2cfc4472ca452a9a9.tar.gz vyatta-cfg-quagga-b07c0515451f5f429ef10ee2cfc4472ca452a9a9.zip | |
Merge branch 'islavista' of git:/git/vyatta-cfg-system into islavista
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/dns-forwarding/vyatta-dns-forwarding.pl | 8 | ||||
| -rwxr-xr-x | scripts/grub-setup | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/scripts/dns-forwarding/vyatta-dns-forwarding.pl b/scripts/dns-forwarding/vyatta-dns-forwarding.pl index 4eebf6d7..1fb2282a 100644 --- a/scripts/dns-forwarding/vyatta-dns-forwarding.pl +++ b/scripts/dns-forwarding/vyatta-dns-forwarding.pl @@ -62,6 +62,14 @@ sub dnsforwarding_get_values { my $config = new VyattaConfig; $config->setLevel("service dns-forwarding"); + + my @ignore_interfaces = $config->returnValues("ignore-interface"); + if ($#ignore_interfaces >= 0) { + foreach my $interface (@ignore_interfaces) { + $output .= "except-interface=$interface\n"; + } + } + my $cache_size = $config->returnValue("cache-size"); if (defined $cache_size) { $output .= "cache-size=$cache_size\n"; diff --git a/scripts/grub-setup b/scripts/grub-setup index fd241995..c954e465 100755 --- a/scripts/grub-setup +++ b/scripts/grub-setup @@ -81,7 +81,7 @@ serial_console="console=tty0 console=ttyS0,9600" echo "Unable to read filesystem UUID. Exiting." exit 1 else - grub_root="root=UUID=$uuid ro" + GRUB_OPTIONS="$GRUB_OPTIONS root=UUID=$uuid ro" fi ( |