summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/dns-forwarding/vyatta-dns-forwarding.pl1
-rwxr-xr-xscripts/vyatta-grub-setup2
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/vyatta-grub-setup b/scripts/vyatta-grub-setup
index 1bf47dde..c37bf7a8 100755
--- a/scripts/vyatta-grub-setup
+++ b/scripts/vyatta-grub-setup
@@ -76,7 +76,7 @@ kernel_versions=$(ls $ROOTFSDIR/boot/vmlinuz-* 2> /dev/null | grep -v xen | awk
# get xen kernel info
xen_kernel_version=$(ls $ROOTFSDIR/boot/vmlinuz*xen 2> /dev/null | awk -F/ '{ print $5 }' | sed 's/vmlinuz//g' | sort -r)
-xen_version=$(ls $ROOTFSDIR/boot/xen-* 2> /dev/null | awk -F/ '{ print $5 }' | sort -r)
+xen_version=$(ls $ROOTFSDIR/boot/xen-*.gz 2> /dev/null | head -1 | awk -F/ '{ print $5 }' | sort -r)
# Figure out whether we are running on the serial or KVM console:
if [ "`tty`" == "/dev/ttyS0" ]; then