From 0be0294232e56ae15e925f1070054bfd0de88754 Mon Sep 17 00:00:00 2001 From: Bob Gilligan Date: Wed, 30 Jul 2008 11:48:06 -0700 Subject: Bugfix: 3519 Fix some typos in standalone_root_pw_reset. --- scripts/standalone_root_pw_reset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/standalone_root_pw_reset b/scripts/standalone_root_pw_reset index b173f22d..336d534d 100755 --- a/scripts/standalone_root_pw_reset +++ b/scripts/standalone_root_pw_reset @@ -70,13 +70,13 @@ cp $CF ${CF}.before_pwrecovery echo "Reseting the root password..." # change system first -newpwd=$(mkpasswd -H md5 vyatta) +newpwd=`mkpasswd -H md5 vyatta` usermod --password "$newpwd" root # escape / in encrypted passwd pw=$(echo $newpwd | sed 's:/:\\/:g') sed -i \ - -e "/^.* user root {/,/}/s/encrypted-password:.*\$/encrypted-password: \"$pw\"/" \ + -e "/^.* user root {/,/}/s/encrypted-password .*\$/encrypted-password \"$pw\"/" \ $CF echo $(date "+%b%e %T") $(hostname) "Root password reset to factory value" \ -- cgit v1.2.3 From c7e46403008ba169b262d24f90e12aaa30d98074 Mon Sep 17 00:00:00 2001 From: Rick Balocca Date: Wed, 30 Jul 2008 12:19:45 -0700 Subject: Partial fix for http://bugzilla.vyatta.com/show_bug.cgi?id=3225 --- debian/vyatta-cfg-system.postinst.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index 61a4842a..109e59d1 100644 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -33,7 +33,7 @@ if [ "$sysconfdir" != "/etc" ]; then fi # cleanup any old entries from previous versions - ed - /etc/sudoers <&/dev/null < Date: Wed, 30 Jul 2008 12:39:23 -0700 Subject: Fix for http://bugzilla.vyatta.com/show_bug.cgi?id=3225 --- debian/vyatta-cfg-system.postinst.in | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index 109e59d1..0dd6248f 100644 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -33,13 +33,12 @@ if [ "$sysconfdir" != "/etc" ]; then fi # cleanup any old entries from previous versions - ed /etc/sudoers >&/dev/null <>/etc/sudoers ### BEGIN VYATTA -- cgit v1.2.3 From 87365a0abddc24dd19b3c237fc04dd3d1417e936 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 30 Jul 2008 15:06:03 -0700 Subject: Get rid of debian build warning Line too long --- debian/copyright | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index f12deb1f..5eb46c84 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,8 @@ This package was debianized by An-Cheng Huang on Thu, 18 Oct 2007 11:03:18 -0700. -It's original content from the GIT repository +It's original content from the GIT repository + Upstream Author: -- cgit v1.2.3 From d2dd129521ef01ce95cb1ba46d6cda19212f71db Mon Sep 17 00:00:00 2001 From: Stig Thormodsrud Date: Wed, 30 Jul 2008 15:41:53 -0700 Subject: Enable IPv6 forwarding. --- sysconf/vyatta-sysctl.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sysconf/vyatta-sysctl.conf b/sysconf/vyatta-sysctl.conf index cb03a614..fae11945 100644 --- a/sysconf/vyatta-sysctl.conf +++ b/sysconf/vyatta-sysctl.conf @@ -24,3 +24,6 @@ net.ipv4.icmp_errors_use_inbound_ifaddr=1 # Turn off SACK since it causes problems with MD5 due to lack of options space net.ipv4.tcp_sack=0 + +# Enable packet forwarding for IPv6 +net.ipv6.conf.all.forwarding=1 -- cgit v1.2.3 From 189dd8d9a5a467aea193aa5ce9e35c0ca14f7b91 Mon Sep 17 00:00:00 2001 From: Stig Thormodsrud Date: Wed, 30 Jul 2008 15:55:43 -0700 Subject: Add IPv6 address to comp_help for bridge/tunnel --- templates/interfaces/bridge/node.tag/address/node.def | 3 ++- templates/interfaces/tunnel/node.tag/address/node.def | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/templates/interfaces/bridge/node.tag/address/node.def b/templates/interfaces/bridge/node.tag/address/node.def index 52188386..3f04ec06 100644 --- a/templates/interfaces/bridge/node.tag/address/node.def +++ b/templates/interfaces/bridge/node.tag/address/node.def @@ -7,5 +7,6 @@ delete:expression: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete allowed: echo "dhcp <>" comp_help:Possible completions: Set the IP address and prefix length - dhcp\t\t\t\tSet the IP address and prefix length via DHCP + Set the IPv6 address and prefix length + dhcp Set the IP address and prefix length via DHCP diff --git a/templates/interfaces/tunnel/node.tag/address/node.def b/templates/interfaces/tunnel/node.tag/address/node.def index 07ea4a0e..3310ee00 100644 --- a/templates/interfaces/tunnel/node.tag/address/node.def +++ b/templates/interfaces/tunnel/node.tag/address/node.def @@ -9,4 +9,5 @@ update:expression: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-update delete:expression: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete $VAR(@) --dev $VAR(../@)"; "Error deleting address $VAR(@) on interface $VAR(../@)" comp_help:Possible completions: - Set the IP address and prefix length + Set the IP address and prefix length + Set the IPv6 address and prefix length -- cgit v1.2.3