summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2008-10-07 17:13:07 +0200
committerStephen Hemminger <stephen.hemminger@vyatta.com>2008-10-07 17:13:07 +0200
commitd9a65a4f20304c60fbf1b112f0f763155437596f (patch)
tree721e27876f75f5a8a4e875e7f640a809a0a54ce9 /scripts
parent7232e04d5d021f60e4cf6463328c165f19d56c6c (diff)
parent41a724bb81b713ab86430c34ccbc9171cdd9d4d0 (diff)
downloadvyatta-cfg-quagga-d9a65a4f20304c60fbf1b112f0f763155437596f.tar.gz
vyatta-cfg-quagga-d9a65a4f20304c60fbf1b112f0f763155437596f.zip
Merge branch 'islavista' of suva.vyatta.com:/git/vyatta-cfg-system into islavista
Diffstat (limited to 'scripts')
-rw-r--r--scripts/dns-forwarding/vyatta-dns-forwarding.pl1
-rw-r--r--scripts/install-system2
2 files changed, 2 insertions, 1 deletions
diff --git a/scripts/dns-forwarding/vyatta-dns-forwarding.pl b/scripts/dns-forwarding/vyatta-dns-forwarding.pl
index 38f5ee67..6cdcfaa0 100644
--- a/scripts/dns-forwarding/vyatta-dns-forwarding.pl
+++ b/scripts/dns-forwarding/vyatta-dns-forwarding.pl
@@ -50,6 +50,7 @@ sub dnsforwarding_get_constants {
chomp $date;
$output = "#\n# autogenerated by vyatta-dns-forwarding.pl on $date\n#\n";
$output .= "log-facility=/var/log/dnsmasq.log\n";
+ $output .= "no-poll\n";
system("rm -f /var/log/dnsmasq.log; touch /var/log/dnsmasq.log");
return $output;
}
diff --git a/scripts/install-system b/scripts/install-system
index d06695e0..20b9f6a3 100644
--- a/scripts/install-system
+++ b/scripts/install-system
@@ -360,7 +360,7 @@ check_for_new_raid () {
echo "Would you like me to create a $part_diag_size MB partition for diagnostics?"
echo -n "(Yes/No) [No]: "
- diag_response=$(get_response "Yes" "Yes No Y N")
+ diag_response=$(get_response "No" "Yes No Y N")
if [ "$diag_response" == "yes" ] || [ "$diag_response" == "y" ]; then
for drive in $drives
do