Ignore:
Timestamp:
11/07/13 08:19:25 (11 months ago)
Author:
Kris Moore <kris@…>
Branches:
9.2-release
Children:
0e61329
Parents:
01c8e13
Message:

Backport a fix to text-installer using wrong pc-sysinstall

File:
1 edited

Legend:

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

    r59f05558 r6abb585  
    1717# Default ZFS layout 
    1818ZFSLAYOUT="/,/root,/tmp(compress=lz4),/usr(canmount=off),/usr/home,/usr/jails,/usr/obj(compress=lz4),/usr/pbi,/usr/ports(compress=lz4),/usr/ports/distfiles(compress=off),/usr/src(compress=lz4),/var(canmount=off),/var/audit(compress=lz4),/var/log(compress=lz4),/var/tmp(compress=lz4)" 
     19 
     20# Location of pc-sysinstall 
     21PCSYS="/usr/local/sbin/pc-sysinstall" 
    1922 
    2023change_zfs() 
     
    182185  # Now we prompt for the disk to install on 
    183186  dOpts="" 
    184   pc-sysinstall disk-list > /tmp/.dList.$$ 
     187  ${PCSYS} disk-list > /tmp/.dList.$$ 
    185188  while read i 
    186189  do 
     
    202205{ 
    203206  # Now prompt for the full-disk or partition to install onto 
    204   pc-sysinstall disk-part $SYSDISK > /tmp/.dList.$$ 
     207  ${PCSYS} disk-part $SYSDISK > /tmp/.dList.$$ 
    205208  dOpts="ALL \"Use entire disk\" on" 
    206209  dFmt=`grep "$SYSDISK-format:" /tmp/.dList.$$ | awk '{print $2}'`  
     
    329332 
    330333  dOpts="auto \"Automatic DHCP\" on" 
    331   pc-sysinstall detect-nics > /tmp/.dList.$$ 
     334  ${PCSYS} detect-nics > /tmp/.dList.$$ 
    332335  while read i 
    333336  do 
     
    532535             read tmp 
    533536             if [ "$tmp" = "y" -o "$tmp" = "Y" ] ; then 
    534                 pc-sysinstall -c ${CFGFILE} 
     537                ${PCSYS} -c ${CFGFILE} 
    535538                rtn 
    536539             fi 
Note: See TracChangeset for help on using the changeset viewer.