Ignore:
Timestamp:
Jun 12, 2013 10:13:21 AM (11 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1
Children:
ed41975
Parents:
a071509
Message:

Add new template combobox to warden GUI, which will allow users to pick from other FreeBSD version/arch templates

File:
1 edited

Legend:

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

    r42584ef r5dbb9c2  
    899899      newJailWizard->setHostIPUsed(uH, uI); 
    900900       
    901       connect( newJailWizard, SIGNAL(create(const QString &, const QString &, const QString &, bool, bool, const QString &, bool, bool, bool, bool, const QString &)), this, SLOT(slotCreateNewJail(const QString &, const QString &, const QString &, bool, bool, const QString &, bool, bool, bool, bool, const QString &) ) ); 
     901      connect( newJailWizard, SIGNAL(create(const QString &, const QString &, const QString &, bool, bool, const QString &, bool, bool, bool, bool, const QString &, const QString &)), this, SLOT(slotCreateNewJail(const QString &, const QString &, const QString &, bool, bool, const QString &, bool, bool, bool, bool, const QString &, const QString &) ) ); 
    902902      newJailWizard->show(); 
    903903} 
    904904 
    905905 
    906 void dialogWarden::slotCreateNewJail( const QString &IP, const QString &IP6, const QString &host, bool tradjail, bool PCUtils, const QString &rootpw, bool src, bool ports, bool autostart, bool linuxJail, const QString &linuxScript ) 
     906void dialogWarden::slotCreateNewJail( const QString &IP, const QString &IP6, const QString &host, bool tradjail, bool PCUtils, const QString &rootpw, bool src, bool ports, bool autostart, bool linuxJail, const QString &linuxScript, const QString &tplate ) 
    907907{ 
    908908    if ( tradjail || linuxJail ) 
     
    940940        args << IP6; 
    941941      } 
     942 
     943      if ( ! linuxJail && ! tplate.isEmpty() ) 
     944        args << "--template" << tplate.section(" ", 0, 0); 
    942945 
    943946      if ( tradjail && ! PCUtils ) 
Note: See TracChangeset for help on using the changeset viewer.