Changeset c02fc90


Ignore:
Timestamp:
11/07/13 08:15:27 (11 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
13b9d3e
Parents:
63e2edc
Message:

Fix which pc-sysinstall we are calling for text-installs

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pc-installdialog/pc-installdialog.sh

    readccc3 rc02fc90  
    2020# Ugly master list of settable ZFS properties 
    2121ZPROPS="aclinherit(discard|noallow|restricted|passthrough|passthrough-x),aclmode(discard|groupmask|passthrough|restricted),atime(on|off),canmount(on|off|noauto),checksum(on|off|fletcher2|fletcher4|sha256),compression(on|off|lzjb|gzip|zle|lz4),copies(1|2|3),dedup(on|off|verify|sha256),exec(on|off),primarycache(all|none|metadata),readonly=(on|off),secondarycache(all|none|metadata),setuid(on|off),sharenfs(on|off),logbias=latency|throughput),snapdir=(hidden|visible),sync=(standard|always|disabled),jailed=(off|on)" 
     22 
     23PCSYS="/usr/local/sbin/pc-sysinstall" 
    2224 
    2325change_zfs() 
     
    185187  # Now we prompt for the disk to install on 
    186188  dOpts="" 
    187   pc-sysinstall disk-list > /tmp/.dList.$$ 
     189  ${PCSYS} disk-list > /tmp/.dList.$$ 
    188190  while read i 
    189191  do 
     
    205207{ 
    206208  # Now prompt for the full-disk or partition to install onto 
    207   pc-sysinstall disk-part $SYSDISK > /tmp/.dList.$$ 
     209  ${PCSYS} disk-part $SYSDISK > /tmp/.dList.$$ 
    208210  dOpts="ALL \"Use entire disk\" on" 
    209211  dFmt=`grep "$SYSDISK-format:" /tmp/.dList.$$ | awk '{print $2}'`  
     
    332334 
    333335  dOpts="auto \"Automatic DHCP\" on" 
    334   pc-sysinstall detect-nics > /tmp/.dList.$$ 
     336  ${PCSYS} detect-nics > /tmp/.dList.$$ 
    335337  while read i 
    336338  do 
     
    535537             read tmp 
    536538             if [ "$tmp" = "y" -o "$tmp" = "Y" ] ; then 
    537                 pc-sysinstall -c ${CFGFILE} 
     539                ${PCSYS} -c ${CFGFILE} 
    538540                rtn 
    539541             fi 
Note: See TracChangeset for help on using the changeset viewer.