--- trunk/installer-simple/bin/installer.sh.in 2014/01/07 14:53:46 2444 +++ trunk/installer-simple/bin/installer.sh.in 2014/01/07 20:55:50 2471 @@ -113,7 +113,7 @@ local SHDD="${HDD//\/dev\/}" messagebox -h $"[ Harddrive partitioning ]" \ - $"\nPlease create 1 partition.\n\n\[ \Z3${SHDD}1\Zn ] type: \Z3linux\Zn with the whole diskspace\n\Please mark ${SHDD}1 \Z3bootable\Zn." + $"Please create 1 partition.\n\n[ \Z3${SHDD}1\Zn ] type: \Z3linux\Zn with the whole diskspace.\nPlease mark ${SHDD}1 \Z3bootable\Zn." } dialog_setup_hdd_info_auto() @@ -180,14 +180,14 @@ zotac*) message+=$"\n\Z2Zotac device detected.\Zn" ;; rangee) message+=$"\n\Z2Rangee device detected.\Zn" ;; maxdata) message+=$"\n\Z2Maxdata device detected.\Zn" ;; - *) message+=$"\n \\ZnCommon device detected.\Zn" ;; + *) message+=$"\n\ZnCommon device detected.\Zn" ;; esac if [[ ${FORMFACTOR} = laptop ]] then - message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving mode.\Zn" + message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving mode.\Zn" fi - messagebox -y 15 -h $"Detected hardware:" "${message}" + messagebox -y 12 -h $"Detected hardware:" "${message}" } dialog_setup_hdd_partitions_manual() @@ -253,7 +253,7 @@ while [[ ${method} -le 2 ]] do - method=$(menubox $"Configuration:" \ + method=$(CANCEL_LABEL=$"Exit" menubox $"Configuration:" \ $"1:Install system" \ $"2:Show detected harddrives" \ $"3:Exit and reboot" \ @@ -468,7 +468,7 @@ popd > /dev/null } -install_bootsector_chroot() +disabled_install_bootsector_chroot() { local my_roothdd local grubconf="${INSTALLROOT}/boot/grub/grub.conf" @@ -573,7 +573,7 @@ rm ${INSTALLROOT}/root/.installrc } -install_initrd_chroot() +disabled_install_initrd_chroot() { # only generate initrds if the cmd exists is_initrd_supported || return 0