Changeset d4d203f


Ignore:
Timestamp:
07/14/14 11:24:38 (12 months ago)
Author:
Josh <joshms@…>
Branches:
master, enter/10, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
bc2cae6, f92b84f
Parents:
b17597c
Message:

Fixed a couple of GELI errors causing the script to fail silently and quit out unexpectedly at another point.

File:
1 edited

Legend:

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

    rb9db6e9 rd4d203f  
    396396  if [ $? -ne 0 ] ; then return ; fi 
    397397  get_dlg_ans "--inputbox 'Enter encryption password' 8 40" 
    398   if [ -z "$ANS" ] ; then exit_err "No password specified!"; fi 
     398 
     399  if [ -z "$ANS" ] ; then 
     400     echo "No password specified!  GELI encryption is currently disabled.  Please run the wizard again to setup GELI encryption!"; rtn 
     401     USINGGELI="NO" 
     402     return 
     403  fi 
     404      
    399405  GELIPASS="$ANS" 
    400406  get_dlg_ans "--inputbox 'Enter password (again)' 8 40" 
    401   if [ -z "$ANS" ] ; then exit_err "No password specified!"; fi 
    402   if [ "$GELIPASS" != "$ANS" ]; then 
    403      echo "ERROR: Password mismatch!" 
     407  if [ -z "$ANS" ] ; then 
     408     echo "No password specified!  GELI encryption is currently disabled.  Please run the wizard again to setup GELI encryption!"; rtn 
    404409     USINGGELI="NO" 
    405410     return 
    406411  fi 
     412      
     413  if [ "$GELIPASS" != "$ANS" ]; then 
     414     echo "ERROR: Password mismatch! GELI encryption is currently disabled.  Please run the wizard again to setup GELI encryption!"; 
     415     rtn 
     416     USINGGELI="NO" 
     417     return 
     418  fi 
    407419 
    408420  USINGGELI="YES" 
     421 
    409422} 
    410423 
Note: See TracChangeset for help on using the changeset viewer.