Merge branch 'master' into glendale

Conflicts:

	scripts/install-system.in

3 files changed, 10 insertions, 3 deletions

diff --git a/scripts/install-system.in b/scripts/install-system.in
index 90a142b7..fc5ad7c4 100755
--- a/scripts/install-system.in
+++ b/scripts/install-system.in
@@ -460,7 +460,9 @@ install_root_filesystem () {
   output=$(cp -pR /boot/* $rootfsdir/boot/)
   output+=$(cp /live/image/live/initrd*.img* $rootfsdir/boot/initrd.img)
   status=$?
-  if [ "$status" != 0 ]; then
+  output+=$(cp /live/image/live/initrd.img-* $rootfsdir/boot/initrd.img)
+  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
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/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;