Changeset 44297bc


Ignore:
Timestamp:
05/27/15 09:28:51 (5 weeks ago)
Author:
Kris Moore <kris@…>
Branches:
master
Children:
f878cbf
Parents:
34b4822
Message:

Add the ability to setup the zpool in a stripe configuration via the
GUI and backend

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src-qt5/pc-installgui/wizardDisk.cpp

    r34b4822 r44297bc  
    396396            } 
    397397         } 
     398         if ( comboZFSMode->currentText() == "stripe" ) { 
     399            labelZFSMsg->setText(tr("Please select the additional disks to stripe")); 
     400            int numChecked = 0; 
     401            for ( int i = 0; i < listZFSDisks->count(); ++i ) 
     402                if ( listZFSDisks->item(i)->checkState() == Qt::Checked ) 
     403                   numChecked++; 
     404            if ( numChecked > 1 ) { 
     405              button(QWizard::NextButton)->setEnabled(true); 
     406              return true; 
     407            } 
     408         } 
     409 
    398410 
    399411         // Disable the next button until we get a working config 
  • src-qt5/pc-installgui/wizardDisk.ui

    rbc4d6d3 r44297bc  
    556556     <widget class="QGroupBox" name="groupZFSOpts"> 
    557557      <property name="title"> 
    558        <string>Enable ZFS mirror/raidz mode</string> 
     558       <string>Add additional disks to zpool</string> 
    559559      </property> 
    560560      <property name="checkable"> 
     
    587587            <property name="text"> 
    588588             <string notr="true">raidz3</string> 
     589            </property> 
     590           </item> 
     591           <item> 
     592            <property name="text"> 
     593             <string>stripe</string> 
    589594            </property> 
    590595           </item> 
  • src-sh/pcbsd-utils/pc-sysinstall/backend/functions-bsdlabel.sh

    r51db80b r44297bc  
    6060    ZFSVARS="`echo $LINE | cut -d ' ' -f 4-20 |cut -d '(' -f 2- | cut -d ')' -f 1 | xargs`" 
    6161 
    62     echo $ZFSVARS | grep -qE "^(disk|file|mirror|raidz(1|2|3)?|spare|log|cache):" 2>/dev/null 
     62    echo $ZFSVARS | grep -qE "^(disk|file|mirror|raidz(1|2|3)?|spare|stripe|log|cache):" 2>/dev/null 
    6363    if [ $? -eq 0 ] ; then 
    6464       ZTYPE=`echo $ZFSVARS | cut -f1 -d:` 
     
    7171          if [ $? -ne 0 ] ; then 
    7272             case $i in 
    73                 disk|file|mirror|raidz1|raidz2|raidz3|spare|log|cache) ZFSVARS="$ZFSVARS ${i}" ;; 
     73                disk|file|mirror|raidz1|raidz2|raidz3|spare|log|cache|stripe) ZFSVARS="$ZFSVARS ${i}" ;; 
    7474                *) ZFSVARS="$ZFSVARS /dev/${i}" ;; 
    7575             esac 
     
    8181 
    8282    # Return the ZFS options 
    83     if [ "${ZTYPE}" = "NONE" ] ; then 
     83    if [ "${ZTYPE}" = "NONE" -o "${ZTYPE}" = "stripe" ] ; then 
    8484      VAR="${ACTIVEDEV} ${ZFSVARS}" 
    8585    else 
Note: See TracChangeset for help on using the changeset viewer.