Alex-Devera/tpotce
1
0
Fork 0
mirror of https://github.com/telekom-security/tpotce.git synced 2025-05-03 21:58:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix error in iso creator

Browse source
This commit is contained in:
t3chn0m4g3 2016-03-08 15:34:37 +01:00
parent 4c83de3995
commit 5d22c0c6bd
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
makeiso.sh
View file

@ -4,7 +4,7 @@
# T-Pot # # T-Pot #
# .ISO maker # # .ISO maker #
# # # #
# v16.03.3 by mo, DTAG, 2016-02-26 # # v16.03.4 by mo, DTAG, 2016-03-08 #
######################################################## ########################################################
# Let's define some global vars # Let's define some global vars
@ -204,11 +204,11 @@ EOF
fi fi
done done
# Let's get Ubuntu 14.04.2 as .iso # Let's get Ubuntu 14.04.4 as .iso
if [ ! -f $myUBUNTUISO ] if [ ! -f $myUBUNTUISO ]
then then
wget $myUBUNTULINK --progress=dot 2>&1 | awk '{print $7+0} fflush()' | dialog --backtitle "$myBACKTITLE" --title "[ Downloading Ubuntu ... ]" --gauge "" 6 70; wget $myUBUNTULINK --progress=dot 2>&1 | awk '{print $7+0} fflush()' | dialog --backtitle "$myBACKTITLE" --title "[ Downloading Ubuntu ... ]" --gauge "" 5 70;
echo 100 | dialog --backtitle "$myBACKTITLE" --title "[ Downloading Ubuntu ... Done! ]" --gauge "" 6 70; echo 100 | dialog --backtitle "$myBACKTITLE" --title "[ Downloading Ubuntu ... Done! ]" --gauge "" 5 70;
else else
dialog --infobox "Using previously downloaded .iso ..." 3 50; dialog --infobox "Using previously downloaded .iso ..." 3 50;
fi fi
@ -236,7 +236,7 @@ chmod 777 -R $myTPOTDIR
# Let's create the new .iso # Let's create the new .iso
cd $myTPOTDIR cd $myTPOTDIR
mkisofs -gui -D -r -V "T-Pot" -cache-inodes -J -l -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -o ../$myTPOTISO ../$myTPOTDIR 2>&1 | awk '{print $1+0} fflush()' | dialog --backtitle "$myBACKTITLE" --title "[ Building T-Pot .iso ... ]" --gauge "" 5 70 0 mkisofs -gui -D -r -V "T-Pot" -cache-inodes -J -l -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -o ../$myTPOTISO ../$myTPOTDIR 2>&1 | awk '{print $1+0} fflush()' | cut -f1 -d"." | dialog --backtitle "$myBACKTITLE" --title "[ Building T-Pot .iso ... ]" --gauge "" 5 70 0
echo 100 | dialog --backtitle "$myBACKTITLE" --title "[ Building T-Pot .iso ... Done! ]" --gauge "" 5 70 echo 100 | dialog --backtitle "$myBACKTITLE" --title "[ Building T-Pot .iso ... Done! ]" --gauge "" 5 70
cd .. cd ..
isohybrid $myTPOTISO isohybrid $myTPOTISO
@ -256,9 +256,9 @@ do
if [ "$myWRITE" = "0" ] if [ "$myWRITE" = "0" ]
then then
umount $myTARGET 2>&1 || true umount $myTARGET 2>&1 || true
(dd if="$myTPOTISO" | pv -n -s $(ls --block-size=1M -vs "$myTPOTISO" | awk '{print $1}')m | dd bs=1M of="$myTARGET") 2>&1 | dialog --backtitle "$myBACKTITLE" --title "[ Writing .iso to target ... ]" --gauge "" 5 70 0 (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 echo 100 | dialog --backtitle "$myBACKTITLE" --title "[ Writing .iso to target ... Done! ]" --gauge "" 5 70
break; break
fi fi
fi fi
else else