Permalink
Browse files

Awesome release. Needs testing now.

  • Loading branch information...
1 parent 9529ea5 commit d98bab848ee7f8c3c5c913de9096556cbc9c739f @thomasfrivold committed Nov 11, 2013
Showing with 19 additions and 7 deletions.
  1. +6 −4 LUKSUS
  2. +12 −2 LUKSUS.functions
  3. +1 −1 LUKSUS.variables
View
10 LUKSUS
@@ -101,23 +101,25 @@ WELCOMEINFORMATION
WIZARD
MENUSYSTEM
GRAPHICALVERIFYCHOICES
-ASKUSERVERIFYCONSOLE # safety check. To be sure.
+# deprechated ASKUSERVERIFYCONSOLE # safety check. To be sure.
+GRAPHICALLASTCHANCE
# PREPARE KEYFILE
CREATEKEYFILE
# LOOP DEVICE FUNCTIONS AND HOUSEKEEPING
-
LOOPBACKTEST
DRAGONFLYHOUSEKEEPING
FREEBSDHOUSEKEEPING
NETBSDHOUSEKEEPING
+
+
# THE STUFF BELOW REQUIRES STABLE RUNTIME VARIABLES
-# NOTE TO SELF - DON'T LET USER CHANGE ANY VARIABLES BELOW HERE
+# NOTE TO SELF - DON'T LET THE USER OR THE PROGRAM ITSELF CHANGE ANY VARIABLES BELOW HERE
+# THESE FUNCTIONS GO HAYWIRE IF THOSE VARIABLES ARE NOT PROPERLY SET
# BEGIN PROGRAM
-
LOOPBACKMETHOD
DEVICEEXISTS
DONTSHREDIFLOOPBACK
View
@@ -40,8 +40,7 @@ esac
GOODBYE()
{
-$dialogapp --msgbox "THANK YOU FOR USING $programname.\n A session summary was saved in $keydir/$name.information" 0 0;
-clear
+$dialogapp --msgbox "Thank you for using $programname $version\nA session summary was saved in $keydir/$name.information" 0 0;
}
SECURITYMODE()
@@ -219,6 +218,17 @@ ASKUSERVERIFYCONSOLE ()
read || exit
}
+GRAPHICALLASTCHANCE()
+{
+ "$dialogapp" --title $programname --msgbox "
+ JUST TO MAKE DOUBLY SURE THAT YOU ARE FORMATTING THE CORRECT DRIVE\n
+ LUKSUS ASKS AGAIN. IS THIS THE CORRECT DEVICE TO FORMAT AND ENCRYPT?\n
+ YOU WILL NUKE THE FOLLOWING DEVICE: $device\n
+ HIT CTRL+C NOW TO QUIT, OR HIT ANY KEY TO CONTINUE\n
+ SERIOUSLY - LAST CHANCE\n" 0 0
+}
+
+
CGD ()
{
if [[ $ENCRYPTION == CGD ]] && [[ $SECURITYMODE == PASSPHRASE ]]; then
View
@@ -24,7 +24,7 @@ freebsdloopnumber=$(echo $device|{ read; echo "${REPLY#${REPLY%?}}";})
ENCRYPTION=LUKS
NEXT=false
#DIALOGAPPOPTIONS="--nocancel"
-DIALOGAPPOPTIONS="--exit-label "PROCEED" --backtitle "$programname $version" --title "$version""
+#DIALOGAPPOPTIONS="--exit-label "PROCEED" --backtitle "$programname $version" "--title "$version"""
#--exit-label "PROCEED"
# Set DEBUGSTEP=DEBUGSTEP to enable debugging
DEBUGSTEP=

0 comments on commit d98bab8

Please sign in to comment.