Changeset 2a39cc54


Ignore:
Timestamp:
01/08/14 07:31:10 (8 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
b6d8045
Parents:
6052403
Message:

Fix a couple of bugs doing ZFS restores when using SSH with a password

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-installgui/scripts/get-zfs-restore-list.sh

    r7ae348f r2a39cc54  
    2121cd /root 
    2222 
    23 ssh ${SSHKEY} -p $SSHPORT -o StrictHostKeyChecking=no -o PasswordAuthentication=no -o NumberOfPasswordPrompts=0 $SSHUSER@$SSHHOST 'ls .lp-props* 2>/dev/null' 2>/dev/null 
     23ssh ${SSHKEY} -p $SSHPORT -o StrictHostKeyChecking=no -o PasswordAuthentication=no -o NumberOfPasswordPrompts=0 $SSHUSER@$SSHHOST 'ls .lp-props*' 2>/dev/null 
    2424exit $? 
  • src-sh/pc-sysinstall/backend/parseconfig.sh

    r8378d50 r2a39cc54  
    7474 
    7575if [ "$INSTALLMODE" = "zfsrestore" ] ; then 
    76   file_sanity_check "sshHost sshPort sshUser sshKey zfsRemoteDataset" 
     76  file_sanity_check "sshHost sshPort sshUser zfsRemoteDataset" 
    7777else 
    7878  file_sanity_check "installMode installType installMedium packageType" 
Note: See TracChangeset for help on using the changeset viewer.