Changeset 06a2b49 for fedkit/gateway_lib.pm

Timestamp:

Jan 21, 2013 11:05:56 PM (11 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

328e93f

Parents:

5dbcc93 (diff), dcac546 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​git://fedd.deterlab.net/fedd

File:

• fedkit/gateway_lib.pm (modified) (3 diffs)

fedkit/gateway_lib.pm

@@ -33 +33 @@
 my $IPROUTE = "/sbin/ip route ";
 
+$BRCTL = '/sbin/brctl' unless -x $BRCTL ;
+
 # Takes an ssh config file and a reference to a hash of keys whose values must
 # be set a specific way.  Replaces existing entries with the set values.
@@ -44 +46 @@
     $t = new File::Temp() || die "Can't open tempfile: $!\n";
 
+    # If the parameter is in the file (even in a comment) update the line to
+    # have the new parameter.
+    my %updated;
     while (<$f>) {
         foreach my $k (keys %{$keys}) {
-            s/^\s*#?\s*$k.*/$k $keys->{$k}/;
+            if (s/^\s*#?\s*$k.*/$k $keys->{$k}/) { $updated{$k}++; }
         }
         print $t $_;
+    }
+    # Any parameters not found above are output directly.
+    foreach my $k (keys %{$keys}) {
+        print $t "$k " . $keys->{$k} . "\n" unless $updated{$k};
     }
     $f->close();
@@ -278 +287 @@
     $ipipe->reader("$IFCONFIG");
     while(<$ipipe>) {
-        /^([[:alnum:]]+):/ && do {
+        /^([[:alnum:]]+):?/ && do {
             $iface = $1;
             next;
         };
-        /inet\s+([0-9\.]+)/ && do {
-            if ($1 eq $addr) {
+        /inet(\s+addr:)?\s*([0-9\.]+)/ && do {
+            if ($2 eq $addr) {
                 $ipipe->close();
                 return $iface;