Changeset 8f654de


Ignore:
Timestamp:
Jan 18, 2013 3:30:52 PM (7 years ago)
Author:
Ted Faber <faber@…>
Branches:
master
Children:
dcac546
Parents:
5e71d34
Message:

More formatting tweaks for Linux

Location:
fedkit
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • fedkit/gateway_lib.pm

    r5e71d34 r8f654de  
    3232my $BRCTL = "/usr/sbin/brctl";
    3333my $IPROUTE = "/sbin/ip route ";
     34
     35$BRCTL = '/sbin/brctl' unless -x $BRCTL ;
    3436
    3537# Takes an ssh config file and a reference to a hash of keys whose values must
     
    285287    $ipipe->reader("$IFCONFIG");
    286288    while(<$ipipe>) {
    287         /^([[:alnum:]]+):/ && do {
     289        /^([[:alnum:]]+):?/ && do {
    288290            $iface = $1;
    289291            next;
    290292        };
    291         /inet\s+([0-9\.]+)/ && do {
    292             if ($1 eq $addr) {
     293        /inet(\s+addr:)?\s*([0-9\.]+)/ && do {
     294            if ($2 eq $addr) {
    293295                $ipipe->close();
    294296                return $iface;
  • fedkit/prep_gateway.pl

    r5e71d34 r8f654de  
    5252    gateway_lib::import_key($ssh_pubkey,'/root/.ssh/authorized_keys')
    5353        if $ssh_pubkey;
     54    # Make sure the tap interface is available
     55    system('modprobe tun');
    5456    # Install bridging software if not present
    5557    if ( -x '/usr/bin/yum' ) {
Note: See TracChangeset for help on using the changeset viewer.