diff --git a/remastersys-gui/usr/bin/remastersys-gui b/remastersys-gui/usr/bin/remastersys-gui index e0ac024..62635cb 100755 --- a/remastersys-gui/usr/bin/remastersys-gui +++ b/remastersys-gui/usr/bin/remastersys-gui @@ -53,7 +53,7 @@ About=$"About" NoFileSelected=$"You didn't select any file.$Continue" mainmenu() { - CHOICES=`$DIALOG_1_nf"$Choose" --title="$TITLETEXT" --width=750 --height=400 $MENU \ + CHOICES=`$DIALOG_1_nf"$Choose" --title="$TITLETEXT" --width=765 --height=415 $MENU \ Backup "$BackupString" \ Dist "$DistString" \ DistCDFS "$DistCDFSString" \ @@ -119,37 +119,21 @@ Visit https://github.com/nerun/ fi } -# Common procedure to backupmenu(), distmenu(), distcdfsmenu() e distisomenu(). -SquashfsSizeCheckup(){ - SQUASHFSSIZE=$(ls -s $WORKDIR/ISOTMP/live/filesystem.squashfs | awk -F " " '{print $1}') - - if [ "$SQUASHFSSIZE" -gt "3999999" ]; then - $DIALOG_2$"The compressed file system is larger than the ISO 9660 specification allows for\na single file.\n\nYou must try to reduce the amount of data you are backing up and try again." --title="$TITLETEXT" - exit 1 - fi -} - # Common procedure to backupmenu(), distmenu() e distisomenu(). FilesReady(){ - $DIALOG_2$"Your $CUSTOMISO and $CUSTOMISO.md5 files are ready in\n$WORKDIR. It is recommended to test it in a virtual machine or on a\nrewritable CD/DVD to ensure it works as desired.\n\nClick on OK to return to the main menu." --title="$TITLETEXT" + $DIALOG_2$"Your files are ready:\n - $WORKDIR/$CUSTOMISO\n - $WORKDIR/$CUSTOMISO.md5\n\nIt is recommended to test it in a virtual machine or on a\nrewritable CD/DVD to ensure it works as desired.\n\nClick on OK to return to the main menu." --title="$TITLETEXT" mainmenu } backupmenu() { $DIALOG_2$"You have selected Backup Mode.\n\nDo not interrupt this process.\n\nClick OK to start the Backup Live CD/DVD process." --title="$TITLETEXT" xterm -fn 9x15 -e "sudo remastersys backup" - - SquashfsSizeCheckup - FilesReady } distmenu() { $DIALOG_2$"You have selected Dist Mode.\n\nClick OK to start the Distributable Live CD/DVD process." --title="$TITLETEXT" xterm -fn 9x15 -e "sudo remastersys dist" - - SquashfsSizeCheckup - FilesReady } @@ -157,8 +141,6 @@ distcdfsmenu() { $DIALOG_2$"You have selected Dist CDFS Mode.\n\nClick OK to start the Distributable Live CD/DVD file system build process." --title="$TITLETEXT" xterm -fn 9x15 -e "sudo remastersys dist cdfs" - SquashfsSizeCheckup - $DIALOG_2$"Your Live CD File System is ready in $WORKDIR. You can now add files\nto the CD and then run the Dist ISO option when you are done.\n\nClick on OK to return to the main menu." --title="$TITLETEXT" mainmenu @@ -168,9 +150,6 @@ distisomenu() { if [ -f "$WORKDIR/ISOTMP/live/filesystem.squashfs" ]; then $DIALOG_2$"You have selected DistISO Mode.\n\nClick OK to create the ISO file." --title="$TITLETEXT" xterm -fn 9x15 -e "sudo remastersys dist iso" - - SquashfsSizeCheckup - FilesReady else $DIALOG_2$"The Live CD file system does not exist.\n\nClick OK to go back to the main menu and try the normal Dist mode or the Dist\nCDFS again." --title="$TITLETEXT" diff --git a/remastersys-gui/usr/lib/remastersys/libremastersysgui.sh b/remastersys-gui/usr/lib/remastersys/libremastersysgui.sh index af80212..fc5c472 100755 --- a/remastersys-gui/usr/lib/remastersys/libremastersysgui.sh +++ b/remastersys-gui/usr/lib/remastersys/libremastersysgui.sh @@ -2,7 +2,7 @@ # NOTE: attribute --fixed do not allows to use --width or --height # actually it works, but not with --text weird... -declare -r DIALOG="$(which yad) --window-icon=/usr/share/icons/hicolor/16x16/apps/remastersys.png --center --always-print-result --dialog-sep --image=/usr/share/icons/hicolor/48x48/apps/remastersys.png" +declare -r DIALOG="$(which yad) --window-icon=/usr/share/icons/hicolor/16x16/apps/remastersys.png --center --borders=10 --always-print-result --dialog-sep --image=/usr/share/icons/hicolor/48x48/apps/remastersys.png" # Cancel / Ok buttons are the default when --button is not provided declare -r MSGBOX="--button=Ok:0" declare -r MENU="--list --column=$Pick --column=$Info" diff --git a/remastersys/etc/remastersys/grub/grub.cfg b/remastersys/etc/remastersys/grub/grub.cfg index 3c2469d..595ff1e 100644 --- a/remastersys/etc/remastersys/grub/grub.cfg +++ b/remastersys/etc/remastersys/grub/grub.cfg @@ -1,5 +1,5 @@ # All labels that looks like "__LABEL__" are replaced by SED in -# /usr/bin/remastersys around lines 359-415. +# /usr/bin/remastersys around lines 345-400. # Translations in /usr/share/locale/pt_BR/LC_MESSAGES/remastersys.po set default="0" diff --git a/remastersys/etc/remastersys/isolinux/isolinux.cfg b/remastersys/etc/remastersys/isolinux/isolinux.cfg index 9592f17..3049794 100644 --- a/remastersys/etc/remastersys/isolinux/isolinux.cfg +++ b/remastersys/etc/remastersys/isolinux/isolinux.cfg @@ -1,5 +1,5 @@ # All labels that looks like "__LABEL__" are replaced by SED in -# /usr/bin/remastersys around lines 359-415. +# /usr/bin/remastersys around lines 345-400. # Translations in /usr/share/locale/pt_BR/LC_MESSAGES/remastersys.po default /isolinux/vesamenu.c32 diff --git a/remastersys/usr/bin/remastersys b/remastersys/usr/bin/remastersys index 51e390e..425ca70 100755 --- a/remastersys/usr/bin/remastersys +++ b/remastersys/usr/bin/remastersys @@ -141,9 +141,6 @@ case $1 in esac -# Used inside both cdfs() and iso(), around lines 550-570 -SpecIso9660=$"The compressed file system is larger than the ISO 9660 specification for a single file allows. You should reduce the amount of files you are trying to backup and try again." - # Function log_msg extracted from PinguyBuilder v5.2 with a few changes. # https://sourceforge.net/projects/pinguy-os/files/ISO_Builder/ # Added log_msg to reduce size. Code provided by Ivailo (a.k.a. SmiL3y) @@ -151,16 +148,6 @@ log_msg() { echo -e "$1" >> $WORKDIR/remastersys.log } -CheckFileSystemSize(){ - #checking the size of the compressed filesystem to ensure it meets the iso9660 spec for a single file" - SQUASHFSSIZE=$(ls -s $WORKDIR/ISOTMP/live/filesystem.squashfs | awk -F " " '{print $1}') - if [ "$SQUASHFSSIZE" -gt "3999999" ]; then - echo $SpecIso9660 - log_msg $SpecIso9660 - exit 1 - fi -} - cdfs(){ # STEP 1 - Create the CD tree in $WORKDIR/ISOTMP @@ -537,8 +524,6 @@ cdfs(){ log_msg "$stripe\nCommand-line options: $@\n$stripe" sleep 1 - - CheckFileSystemSize # call function at line 180 } iso(){ @@ -559,8 +544,6 @@ iso(){ exit 1 fi - CheckFileSystemSize # call function at line 180 - #isolinux mode sleep 1 @@ -576,7 +559,8 @@ iso(){ phrase1="$Creating $CUSTOMISO $In $WORKDIR $Using grub-mkrescue." echo -e "$phrase1" log_msg "$phrase1" - grub-mkrescue -o $WORKDIR/$CUSTOMISO $WORKDIR/ISOTMP/ 2>>$WORKDIR/remastersys.log 1>>$WORKDIR/remastersys.log + grub-mkrescue -iso-level 4 \ + -o $WORKDIR/$CUSTOMISO $WORKDIR/ISOTMP/ 2>>$WORKDIR/remastersys.log 1>>$WORKDIR/remastersys.log else phrase2="$Creating $CUSTOMISO $In $WORKDIR $Using $CREATEISO." echo -e "$phrase2"