From 6d7608d112434153cf68b6d2d212dd1c0b288cde Mon Sep 17 00:00:00 2001
From: t3chn0m4g3 <t3chn0m4g3@gmail.com>
Date: Fri, 28 Oct 2016 15:08:55 +0200
Subject: [PATCH] tweaking, fixing

lift resolution constraints (keep autodetect from kernel fb)
thanks to @sunshine112 reporting issue #62 - the reason why the install fails is due to the fact that the latest kernel is very picky about a clean unmount of the used block device. the block device will now be unmounted cleanly as soon as the write operation of the ISO Maker is finished writing the image to the USB drive.
---
 installer/install.sh | 12 ++++++------
 makeiso.sh           |  7 ++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/installer/install.sh b/installer/install.sh
index 87ad9d38..995d9ba9 100755
--- a/installer/install.sh
+++ b/installer/install.sh
@@ -3,7 +3,7 @@
 # T-Pot post install script                            #
 # Ubuntu server 16.04.0, x64                           #
 #                                                      #
-# v16.10.0 by mo, DTAG, 2016-10-27                     #
+# v16.10.0 by mo, DTAG, 2016-10-28                     #
 ########################################################
 
 # Some global vars
@@ -468,11 +468,11 @@ chown tsec:tsec /home/tsec/.ssh /home/tsec/.ssh/authorized_keys
 # Let's replace "quiet splash" options, set a console font for more screen canvas and update grub
 sed -i 's#GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"#GRUB_CMDLINE_LINUX_DEFAULT="consoleblank=0"#' /etc/default/grub
 sed -i 's#GRUB_CMDLINE_LINUX=""#GRUB_CMDLINE_LINUX="cgroup_enable=memory swapaccount=1"#' /etc/default/grub
-sed -i 's#\#GRUB_GFXMODE=640x480#GRUB_GFXMODE=800x600x32#' /etc/default/grub
-tee -a /etc/default/grub <<EOF
-GRUB_GFXPAYLOAD=800x600x32
-GRUB_GFXPAYLOAD_LINUX=800x600x32
-EOF
+#sed -i 's#\#GRUB_GFXMODE=640x480#GRUB_GFXMODE=800x600x32#' /etc/default/grub
+#tee -a /etc/default/grub <<EOF
+#GRUB_GFXPAYLOAD=800x600x32
+#GRUB_GFXPAYLOAD_LINUX=800x600x32
+#EOF
 update-grub
 cp /usr/share/consolefonts/Uni2-Terminus12x6.psf.gz /etc/console-setup/
 gunzip /etc/console-setup/Uni2-Terminus12x6.psf.gz
diff --git a/makeiso.sh b/makeiso.sh
index c5737c7e..08a4f29f 100755
--- a/makeiso.sh
+++ b/makeiso.sh
@@ -4,7 +4,7 @@
 # T-Pot                                                #
 # .ISO creator                                         #
 #                                                      #
-# v16.10.0 by mo, DTAG, 2016-07-04                     #
+# v16.10.0 by mo, DTAG, 2016-10-28                     #
 ########################################################
 
 # Let's define some global vars
@@ -14,7 +14,7 @@ myUBUNTUISO="mini.iso"
 myTPOTISO="tpot.iso"
 myTPOTDIR="tpotiso"
 myTPOTSEED="preseed/tpot.seed"
-myPACKAGES="dialog genisoimage syslinux syslinux-utils pv"
+myPACKAGES="dialog genisoimage syslinux syslinux-utils pv udisks2"
 myAUTHKEYSPATH="installer/keys/authorized_keys"
 myPFXPATH="installer/keys/8021x.pfx"
 myPFXPWPATH="installer/keys/8021x.pw"
@@ -261,9 +261,10 @@ do
           myWRITE=$?
           if [ "$myWRITE" = "0" ]
             then
-              umount $myTARGET 2>&1 || true
+              umount $myTARGET? 2>&1 || true
               (pv -n "$myTPOTISO" | dd of="$myTARGET") 2>&1 | dialog --backtitle "$myBACKTITLE" --title "[ Writing .iso to target ... ]" --gauge "" 5 70 0
               echo 100 | dialog --backtitle "$myBACKTITLE" --title "[ Writing .iso to target ... Done! ]" --gauge "" 5 70
+              udisksctl power-off -b $myTARGET 2>&1
               break
           fi
       fi