From d2d376a3cfdfbc06c1f60f8c0a436777a4050738 Mon Sep 17 00:00:00 2001 From: Kevin Puertas Date: Sat, 27 May 2017 12:41:12 +0200 Subject: [PATCH] Changed summary because lsblk --- installer/installer.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/installer/installer.sh b/installer/installer.sh index 06df5be..4eaccd5 100755 --- a/installer/installer.sh +++ b/installer/installer.sh @@ -761,24 +761,23 @@ if [[ $mosfraiz != "$(T "not formatted")" ]];then else echo "Root partition $particionraiz not formatted" >> "/tmp/install.log" fi +tamraiz=`lsblk /dev/$particionraiz --noheadings --output SIZE` if [[ $particionhome ]];then if [[ $mosfhome != "$(T "not formatted")" ]];then echo "Format $mosfhome the partiton $particionhome for /home" >> "/tmp/install.log" else echo "Home partition $particionhome not formatted" >> "/tmp/install.log" fi + tamhome=`lsblk /dev/$particionhome --noheadings --output SIZE` fi # #For do output in multiline, lsblk has to be in a var for echoing with " " -lsblkout=`lsblk --output NAME,KNAME,FSTYPE,SIZE,LABEL` # Make the question dialog --nocancel --stdout --yes-label "Si, instalar" --no-label "No, volver a empezar" --yesno "$(T "Ok, last thing before start installing, summary of changes")\n \ -$(T "Partition scheme before your changes") \n \ -echo \"`lsblk --output NAME,KNAME,FSTYPE,SIZE,LABEL`\" \n \ $(T "Your changes") \n \ -$(T "Root partition"): $particionraiz , $mosfraiz \n \ -$(T "Home partition"): $particionhome , $mosfhome \n \ +$(T "Root partition"): $particionraiz, de $tamraiz , $mosfraiz \n \ +$(if [[ $particionhome ]];then echo $(T "Home partition"): $particionhome, de $tamhome, $mosfhome;fi) \n \ $(if [[ $partefi ]];then echo $(T "EFI partition in") $partefi;fi) \n \ ¿Estas de acuerdo con los cambios y quieres comenzar la instalacion?" 0 0