Diff of /trunk/installer-simple/bin/installer.sh.in

Parent Directory | Revision Log | Patch

	revision 2412 by niro, Tue Jan 7 13:33:46 2014 UTC	revision 2416 by niro, Tue Jan 7 13:37:49 2014 UTC
#	Line 127  dialog_setup_system_menu()	Line 127  dialog_setup_system_menu()
127	local mode	local mode
128	local retval	local retval
129
130	mode=$(dialog \	mode=$(menubox -h $"[ Harddrive partitioning ]" $"\nSelect an installation mode" \
131	--backtitle "${TITLE}" \	$"1:Automatic setup (recommended)" \
132	--title "[ Festplatten Partitionierung ]" \	":" \
133	--cancel-label "Abbrechen" \	$":\Z1Expert modes:\Zn" \
134	--ok-label "Weiter" \	$"2:Common IDE-disk (manual setup)")
	--stdout \
	--colors \
	--menu "\nWaehlen Sie die Installations-Methode" 14 70 5 \
	"1" "Automatisches Setup (Empfohlen)" \
	"" "" \
	"" "\Z1Experten Modi:\Zn" \
	"2" "Normale IDE-Disk (Manuell)" \
135	retval=$?	retval=$?
136	[[ ${retval} -eq 1 ]] && return 1	[[ ${retval} -eq 1 ]] && return 1
137	if [[ ${retval} -eq 0 ]]	if [[ ${retval} -eq 0 ]]
138	then	then
139	case "${i}" in	case "${mode}" in
140	"1") run_install_auto ;;	"1") run_install_auto ;;
141	"2") run_install_normal ;;	"2") run_install_normal ;;
142	"") dialog_setup_system_menu;;	"") dialog_setup_system_menu;;
#	Line 215  dialog_hardware_detection()	Line 208  dialog_hardware_detection()
208	fi	fi
209	}	}
210
211	dialog_setup_hdd_partitions_manuell()	dialog_setup_hdd_partitions_manual()
212	{	{
213	local i	local i
214
#	Line 248  dialog_setup_hdd_partitions_manuell()	Line 241  dialog_setup_hdd_partitions_manuell()
241	if [[ ${RES} -eq 0 ]]	if [[ ${RES} -eq 0 ]]
242	then	then
243	dialog_setup_hdd_info	dialog_setup_hdd_info
244	setup_hdd_partitions_manuell	setup_hdd_partitions_manual
245	fi	fi
246	fi	fi
247	}	}
#	Line 544  EOF	Line 537  EOF
537	fi	fi
538	}	}
539
540	setup_hdd_partitions_manuell()	setup_hdd_partitions_manual()
541	{	{
542	ROOTHDD="${HDD}1"	ROOTHDD="${HDD}1"
543
544	## hdds partitionieren manuell	## hdds partitionieren manual
545	cfdisk ${HDD} || dialog_die	cfdisk ${HDD} || dialog_die
546	}	}
547
#	Line 825  run_install_normal()	Line 818  run_install_normal()
818	{	{
819	dialog_hardware_detection	dialog_hardware_detection
820
821	dialog_setup_hdd_partitions_manuell	dialog_setup_hdd_partitions_manual
822	dialog_setup_hdd_format	dialog_setup_hdd_format
823	setup_hdd_format > /dev/null	setup_hdd_format > /dev/null
824	install_mount_rootfs	install_mount_rootfs

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.2412   changed lines   Added in v.2416