Changeset 58a4795


Ignore:
Timestamp:
01/16/14 09:05:07 (6 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
34182ea
Parents:
4efda4d
Message:

Fix some bugs importing jails via the Warden GUI, in particular when we try to set a new
ipv4 address.

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/warden-gui/dialogimport.cpp

    r1620346 r58a4795  
    3434    IP="OFF"; host="OFF"; 
    3535    if (groupIP->isChecked() ) 
    36       IP = "--ip=" + lineIP->text(); 
     36      IP = lineIP->text(); 
    3737    if (groupHostname->isChecked() ) 
    38       host = "--host=" + lineHostname->text(); 
     38      host = lineHostname->text(); 
    3939     
    4040    emit import(IP, host); 
  • src-qt4/warden-gui/dialogwarden.cpp

    r4efda4d r58a4795  
    10601060      QString program = "warden"; 
    10611061      QStringList args; 
    1062       args << "import" << importFile << IP << Host; 
    1063  
     1062      args << "import" << importFile; 
     1063      if ( ! IP.isEmpty() ) 
     1064        args << "--ipv4=" + IP + "/24"; 
     1065      if ( ! Host.isEmpty() ) 
     1066        args << "--host=" + Host; 
     1067 
     1068      qDebug() << args; 
    10641069       
    10651070      // Connect the exited signal and start the process  
  • src-sh/warden/bin/warden

    r228303d r58a4795  
    990990              #Sanity check on the IP 
    991991              if ! is_ipv4 "${IP4}" ; then 
    992                  exit_err "Invalid IPv4 address!" 
     992                 exit_err "Invalid IPv4 address: $IP4" 
    993993              fi 
    994994 
     
    10011001           fi 
    10021002 
    1003            # Check if we have a new IPv4 address for this import 
     1003           # Check if we have a new IPv6 address for this import 
    10041004           echo "${i}" | grep '\-\-ipv6=' >/dev/null 2>/dev/null 
    10051005           if [ "$?" = "0" ] 
Note: See TracChangeset for help on using the changeset viewer.