Changeset 9461624


Ignore:
Timestamp:
07/15/14 14:08:21 (2 weeks ago)
Author:
Josh <joshms@…>
Branches:
master
Children:
3551066
Parents:
1fff3bab
Message:

Put GELI warning messages inside a dialogue box

File:
1 edited

Legend:

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

    r1fff3bab r9461624  
    398398 
    399399  if [ -z "$ANS" ] ; then 
    400      echo "No password specified!  GELI encryption is currently disabled.  Please run the wizard again to setup GELI encryption!"; rtn 
     400     echo "No password specified!  GELI encryption is currently disabled." >> /tmp/.GELIinfo.$$ 
     401     echo "Please run the wizard again to setup GELI encryption!" >> /tmp/.GELIinfo.$$ 
    401402     USINGGELI="NO" 
     403     dialog --tailbox /tmp/.GELIinfo.$$ 10 80 
     404     rm /tmp/.GELIinfo.$$ 
    402405     return 
    403406  fi 
     
    406409  get_dlg_ans "--inputbox 'Enter password (again)' 8 40" 
    407410  if [ -z "$ANS" ] ; then 
    408      echo "No password specified!  GELI encryption is currently disabled.  Please run the wizard again to setup GELI encryption!"; rtn 
     411     echo "No password specified!  GELI encryption is currently disabled." >> /tmp/.GELIinfo.$$ 
     412     echo "Please run the wizard again to setup GELI encryption!" >> /tmp/.GELIinfo.$$ 
    409413     USINGGELI="NO" 
     414     dialog --tailbox /tmp/.GELIinfo.$$ 10 80 
     415     rm /tmp/.GELIinfo.$$ 
    410416     return 
    411417  fi 
    412418      
    413419  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 
     420     echo "ERROR: Password mismatch! GELI encryption is currently disabled." >> /tmp/.GELIinfo.$$ 
     421     echo "Please run the wizard again to setup GELI encryption!" >> /tmp/.GELIinfo.$$ 
    416422     USINGGELI="NO" 
     423     dialog --tailbox /tmp/.GELIinfo.$$ 10 80 
     424     rm /tmp/.GELIinfo.$$ 
    417425     return 
    418426  fi 
Note: See TracChangeset for help on using the changeset viewer.