Changeset 8f654de

Timestamp:

Jan 18, 2013 3:30:52 PM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

dcac546

Parents:

5e71d34

Message:

More formatting tweaks for Linux

Location:

fedkit

Files:

• gateway_lib.pm (modified) (2 diffs)
• prep_gateway.pl (modified) (1 diff)

fedkit/gateway_lib.pm

@@ -32 +32 @@
 my $BRCTL = "/usr/sbin/brctl";
 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
@@ -285 +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;

fedkit/prep_gateway.pl

@@ -52 +52 @@
     gateway_lib::import_key($ssh_pubkey,'/root/.ssh/authorized_keys')
         if $ssh_pubkey;
+    # Make sure the tap interface is available
+    system('modprobe tun');
     # Install bridging software if not present
     if ( -x '/usr/bin/yum' ) {