diff options
| author | Bob Gilligan <gilligan@vyatta.com> | 2008-10-09 17:22:25 -0700 |
|---|---|---|
| committer | Bob Gilligan <gilligan@vyatta.com> | 2008-10-09 17:22:25 -0700 |
| commit | 2abb4626a99c176542cad3b747e1b145881683c0 (patch) | |
| tree | 5c8f88636951eb6911877d0944b046e9f45bbb10 | |
| parent | 8d8dee18e6fc0cbd65916ea32ef364be93a85242 (diff) | |
| parent | 2e20a0901c98266daec3056b0226d4672942bcad (diff) | |
| download | vyatta-cfg-quagga-2abb4626a99c176542cad3b747e1b145881683c0.tar.gz vyatta-cfg-quagga-2abb4626a99c176542cad3b747e1b145881683c0.zip | |
Merge branch 'islavista' of http://git.vyatta.com/vyatta-cfg-system into islavista
| -rw-r--r-- | debian/vyatta-cfg-system.postinst.in | 3 | ||||
| -rw-r--r-- | scripts/dns-forwarding/vyatta-dns-forwarding.pl | 1 | ||||
| -rwxr-xr-x | scripts/vyatta-grub-setup | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index 925edcb5..868029d5 100644 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -60,7 +60,7 @@ Cmnd_Alias DATE = /bin/date, /usr/sbin/ntpdate Cmnd_Alias PPPOE_CMDS = /sbin/pppd, /sbin/poff Cmnd_Alias PCAPTURE = /usr/bin/tshark, /usr/bin/tcpdump %operator ALL=NOPASSWD: /sbin/reboot, DATE, IPTABLES, ETHTOOLP, IPFLUSH, \ - PPPOE_CMDS, PCAPTURE, /usr/sbin/wanpipemon + PPPOE_CMDS, PCAPTURE, /usr/sbin/wanpipemon, /usr/bin/lsof EOF cat <<EOF >>/etc/sudoers %users ALL=NOPASSWD: ${bindir}/sudo-users/ @@ -91,6 +91,7 @@ sed -i 's/^set /builtin set /' /etc/bash_completion # for password sed -i 's/requisite[ \t][ \t]*pam_securetty.so/required pam_securetty.so/' $rootfsdir/etc/pam.d/login +[ grep "blacklist.*snd-pcsp" >&/dev/null ] || echo "blacklist snd-pcsp" >>/etc/modprobe.d/blacklist # Local Variables: # mode: shell-script 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 |