diff options
| author | rbalocca <rbalocca@fugazi.vyatta.com> | 2007-11-27 12:47:06 -0800 |
|---|---|---|
| committer | rbalocca <rbalocca@fugazi.vyatta.com> | 2007-11-27 12:47:06 -0800 |
| commit | b1fd90f10917c28e25cca0eba1ec7d6200679bdc (patch) | |
| tree | 539038bc351833126839f8e4ca9a275505e1c8c3 | |
| parent | c095fa715a6fae2f6b36a8a27ad24e9f24788f5b (diff) | |
| parent | 619cfac2cf37a21297dd1fb51116dc4ec30d4112 (diff) | |
| download | vyatta-cfg-quagga-b1fd90f10917c28e25cca0eba1ec7d6200679bdc.tar.gz vyatta-cfg-quagga-b1fd90f10917c28e25cca0eba1ec7d6200679bdc.zip | |
Merge branch 'master' into glendale
Conflicts:
scripts/install-system.in
| -rw-r--r-- | debian/control | 3 | ||||
| -rwxr-xr-x | scripts/install-system.in | 4 | ||||
| -rwxr-xr-x | scripts/keepalived/VyattaKeepalived.pm | 6 | ||||
| -rwxr-xr-x | scripts/system/vyatta_update_login_user.pl | 3 | ||||
| -rw-r--r-- | templates/interfaces/ethernet/node.tag/vrrp/node.def | 3 |
5 files changed, 14 insertions, 5 deletions
diff --git a/debian/control b/debian/control index 13652305..88938b4a 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,8 @@ Depends: bash (>= 3.1), perl (>= 5.8.8), procps (>= 1:3.2.7-3), coreutils (>= 5.97-5.3), - vyatta-cfg, sysv-rc, ifrename, ntp, sysklogd, busybox, ssh, whois, sudo, snmpd, keepalived + vyatta-cfg, sysv-rc, ifrename, ntp, sysklogd, busybox, ssh, whois, sudo, + snmpd, keepalived, vyatta-bash Suggests: util-linux (>= 2.13-5), net-tools, ethtool, 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; 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 $(../@) " |