From f50d376954e29731a1577b94f52193a13059d047 Mon Sep 17 00:00:00 2001
From: An-Cheng Huang <ancheng@vyatta.com>
Date: Thu, 15 Nov 2007 11:02:53 -0800
Subject: users added through our CLI now use "vbash" (from vyatta-bash
 package).

---
 scripts/system/vyatta_update_login_user.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/system/vyatta_update_login_user.pl b/scripts/system/vyatta_update_login_user.pl
index b246cee6..d84ee4b0 100755
--- a/scripts/system/vyatta_update_login_user.pl
+++ b/scripts/system/vyatta_update_login_user.pl
@@ -145,7 +145,8 @@ exit 4 if (!defined($user) || !defined($full) || !defined($encrypted)
 exit 4 if (!defined($group_map{$group}));
 $group = $group_map{$group};
 
-my $DEF_SHELL = "/bin/bash";
+# note that DEF_SHELL doesn't affect root since root is never "added"
+my $DEF_SHELL = "/bin/vbash";
 
 open(GRP, "/etc/group") or exit 5;
 my $def_gid = undef;
-- 
cgit v1.2.3


From 5d09a07e0fa9567559f2929f026cdf970a8015df Mon Sep 17 00:00:00 2001
From: Stig Thormodsrud <stig@uffda.(none)>
Date: Mon, 19 Nov 2007 15:55:45 -0800
Subject: Fix 2498 vrrp configuration can NOT be committed.

---
 scripts/keepalived/VyattaKeepalived.pm               | 6 +++++-
 templates/interfaces/ethernet/node.tag/vrrp/node.def | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/keepalived/VyattaKeepalived.pm b/scripts/keepalived/VyattaKeepalived.pm
index c8d732d1..f7e62b19 100755
--- a/scripts/keepalived/VyattaKeepalived.pm
+++ b/scripts/keepalived/VyattaKeepalived.pm
@@ -136,7 +136,11 @@ sub vrrp_get_config {
     my $config = new VyattaConfig;
 
     $config->setLevel("interfaces ethernet $intf");
-    my $primary_addr = $config->returnOrigValue("address");
+    my $primary_addr = $config->returnOrigValue("address"); 
+    if (!defined $primary_addr) {
+	$primary_addr = "0.0.0.0";
+    }
+
     if ($primary_addr =~ m/(\d+\.\d+\.\d+\.\d+)\/\d+/) {
 	$primary_addr = $1;
     }
diff --git a/templates/interfaces/ethernet/node.tag/vrrp/node.def b/templates/interfaces/ethernet/node.tag/vrrp/node.def
index 38622243..de3253a5 100644
--- a/templates/interfaces/ethernet/node.tag/vrrp/node.def
+++ b/templates/interfaces/ethernet/node.tag/vrrp/node.def
@@ -1,4 +1,5 @@
 help: "Configure VRRP"
-commit: $(virtual-address/@) != ""; "must define the virtual-address"
+commit: $(../address/) != ""; "Must define a primary IP address on $(../@)"
+commit: $(virtual-address/) != ""; "Must define the virtual-address for vrrp-group $(../vrrp-group/@)"
 end: "sudo /opt/vyatta/sbin/vyatta-keepalived.pl --vrrp-action update --intf $(../@) "
 
-- 
cgit v1.2.3


From 619cfac2cf37a21297dd1fb51116dc4ec30d4112 Mon Sep 17 00:00:00 2001
From: rbalocca <rbalocca@fugazi.vyatta.com>
Date: Tue, 27 Nov 2007 12:32:14 -0800
Subject: Fix bug in install-system that was preventing error reporting when
 installing isolinux

---
 scripts/install-system.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/install-system.in b/scripts/install-system.in
index cf7ff263..49634a03 100755
--- a/scripts/install-system.in
+++ b/scripts/install-system.in
@@ -461,8 +461,8 @@ install_root_filesystem () {
   output+=$(cp /live/image/live/vmlinuz-* $rootfsdir/boot/)
   status=$?
   output+=$(cp /live/image/live/initrd.img-* $rootfsdir/boot/initrd.img)
-  status=$status || $?
-  if [ "$status" != 0 ]; then
+  status=$status$?
+  if [ "$status" -ne 0 ]; then
     echo -e "Error trying to copy the bootfiles.\nPlease see install log for more details.\nExiting.
 .."
     echo -e "Error trying to copy the bootfiles.\ncp /boot/initrd.img $rootfsdir/boot/\n$output" >> $INSTALL_LOG
-- 
cgit v1.2.3