From 1bc15089f78fc0778be78448e43ad33fd05e1e55 Mon Sep 17 00:00:00 2001 From: John Southworth Date: Fri, 24 Jun 2011 17:55:35 -0500 Subject: Make add system image use the new config directory for copying files --- scripts/install/install-functions | 1 + scripts/install/install-image-existing | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'scripts') diff --git a/scripts/install/install-functions b/scripts/install/install-functions index 5670f82a..5e24a921 100755 --- a/scripts/install/install-functions +++ b/scripts/install/install-functions @@ -41,6 +41,7 @@ CD_SQUASH_ROOT=/mnt/cdsquash # the vyatta config dir VYATTA_CFG_DIR=${vyatta_sysconfdir}/config +VYATTA_NEW_CFG_DIR=/config # the floppy config dir FD_CFG_DIR=/media/floppy/config diff --git a/scripts/install/install-image-existing b/scripts/install/install-image-existing index 13af9bf8..94a0033b 100755 --- a/scripts/install/install-image-existing +++ b/scripts/install/install-image-existing @@ -175,12 +175,12 @@ fi # Check to make sure we have enough space to copy the config and data dirs... # space_avail=`df -k / | tail -1 | awk '{ print $4 }'` -if [ -e $${VYATTA_CFG_DIR}/data ]; then - space_needed_data=`du -s ${VYATTA_CFG_DIR}/data | awk '{ print $1 }'` +if [ -e $${VYATTA_NEW_CFG_DIR}/data ]; then + space_needed_data=`du -s ${VYATTA_NEW_CFG_DIR}/data | awk '{ print $1 }'` else space_needed_data=0 fi -space_needed_configdata=`du -s ${VYATTA_CFG_DIR} | awk '{ print $1 }'` +space_needed_configdata=`du -s ${VYATTA_NEW_CFG_DIR} | awk '{ print $1 }'` space_needed_config=$(($space_needed_configdata - $space_needed_data)) # save current config dir if needed @@ -192,9 +192,9 @@ if [ $space_avail -gt $space_needed_configdata ]; then resp=$(get_response "Yes" "Yes No Y N") if [ "$resp" == 'yes' ] || [ "$resp" == 'y' ]; then echo 'Copying current configuration...' - ndir=${INST_ROOT}/config + ndir=${INST_ROOT}/${VYATTA_NEW_CFG_DIR} mkdir -p $ndir - find $VYATTA_CFG_DIR -maxdepth 1 -mindepth 1 \ + find $VYATTA_NEW_CFG_DIR -maxdepth 1 -mindepth 1 \ -exec cp '-a' '{}' "$ndir/" ';' chgrp -R vyattacfg $ndir chmod -R 775 $ndir -- cgit v1.2.3 From 824d961ba24251866e28a53aa71adff377c56192 Mon Sep 17 00:00:00 2001 From: John Southworth Date: Fri, 1 Jul 2011 17:31:40 -0700 Subject: bugfix 6801: check to see if the same address is configured on another interface in the working config before allowing an address to be set on an interface, allows for swapping addresses in the same commit --- scripts/vyatta-interfaces.pl | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/vyatta-interfaces.pl b/scripts/vyatta-interfaces.pl index 26f2791a..f139dcf6 100755 --- a/scripts/vyatta-interfaces.pl +++ b/scripts/vyatta-interfaces.pl @@ -103,6 +103,31 @@ sub is_ip_configured { return ($found > 0); } +sub is_uniq_address { + my $ip = pop(@_); + my @cfgifs = Vyatta::Interface::get_all_cfg_interfaces(); + my $config = new Vyatta::Config; + my %addr_hash = (); + foreach my $intf ( @cfgifs ) { + my $addrs = [ ]; + my $path = "$intf->{'path'}"; + if ($path =~ /openvpn/) { + $addrs = [$config->listNodes("$path local-address")]; + } else { + $addrs = [$config->returnValues("$path address")]; + } + foreach my $addr ( @{$addrs} ){ + if (not exists $addr_hash{$addr}){ + $addr_hash{$addr} = { _intf => [ $intf->{name} ] }; + } else { + $addr_hash{$addr}->{_intf} = + [ @{$addr_hash{$addr}->{_intf}}, $intf->{name} ]; + } + } + } + return ((scalar @{$addr_hash{$ip}->{_intf}}) <= 1); +} + sub is_ipv4 { return index($_[0],':') < 0; } @@ -290,12 +315,12 @@ sub is_valid_addr_commit { my ($dhcp, $static_v4); foreach my $addr (@addrs) { next if ($addr eq 'dhcpv6'); - if ($addr eq 'dhcp') { $dhcp = 1; - } elsif ($ipaddr_hash{$addr} && !is_ip_configured($ifname, $addr)) { - my $h = Vyatta::Misc::get_ipnet_intf_hash(); - print "Warning: possible duplicate address $addr on $h->{$addr}\n"; + } elsif (!is_uniq_address($addr)) { + my $h = Vyatta::Misc::get_ipnet_intf_hash(); + print "Error: duplicate address $addr on $h->{$addr}\n"; + exit 1; } elsif ( is_ipv4($addr) ) { $static_v4 = 1; } -- cgit v1.2.3 From 7beacb03c80c24305b5b450dc79783bcbe398780 Mon Sep 17 00:00:00 2001 From: John Southworth Date: Tue, 5 Jul 2011 16:20:57 -0500 Subject: Move the is_uniq_address function to Interface.pm --- scripts/vyatta-interfaces.pl | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) (limited to 'scripts') diff --git a/scripts/vyatta-interfaces.pl b/scripts/vyatta-interfaces.pl index f139dcf6..a5bb2553 100755 --- a/scripts/vyatta-interfaces.pl +++ b/scripts/vyatta-interfaces.pl @@ -103,31 +103,6 @@ sub is_ip_configured { return ($found > 0); } -sub is_uniq_address { - my $ip = pop(@_); - my @cfgifs = Vyatta::Interface::get_all_cfg_interfaces(); - my $config = new Vyatta::Config; - my %addr_hash = (); - foreach my $intf ( @cfgifs ) { - my $addrs = [ ]; - my $path = "$intf->{'path'}"; - if ($path =~ /openvpn/) { - $addrs = [$config->listNodes("$path local-address")]; - } else { - $addrs = [$config->returnValues("$path address")]; - } - foreach my $addr ( @{$addrs} ){ - if (not exists $addr_hash{$addr}){ - $addr_hash{$addr} = { _intf => [ $intf->{name} ] }; - } else { - $addr_hash{$addr}->{_intf} = - [ @{$addr_hash{$addr}->{_intf}}, $intf->{name} ]; - } - } - } - return ((scalar @{$addr_hash{$ip}->{_intf}}) <= 1); -} - sub is_ipv4 { return index($_[0],':') < 0; } @@ -317,7 +292,7 @@ sub is_valid_addr_commit { next if ($addr eq 'dhcpv6'); if ($addr eq 'dhcp') { $dhcp = 1; - } elsif (!is_uniq_address($addr)) { + } elsif (!Vyatta::Interface::is_uniq_address($addr)) { my $h = Vyatta::Misc::get_ipnet_intf_hash(); print "Error: duplicate address $addr on $h->{$addr}\n"; exit 1; -- cgit v1.2.3