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

Parent Directory | Revision Log | Patch

	revision 2474 by niro, Wed Jan 8 08:55:40 2014 UTC	revision 2475 by niro, Wed Jan 8 08:59:52 2014 UTC
#	Line 110  dialog_warning()	Line 110  dialog_warning()
110	fi	fi
111	}	}
112
113	dialog_setup_system_menu()	task_setup_system_menu()
114	{	{
115	local mode	local mode
116	local retval	local retval
117
118	mode=$(menubox -h $"[ Harddrive partitioning ]" $"\nSelect an installation mode" \	mode="$(dialog_setup_system_menu)"
	$"1:Automatic setup (recommended)" \
	":" \
	$":\Z1Expert modes:\Zn" \
	$"2:Common IDE-disk (manual setup)")
119	retval=$?	retval=$?
120	[[ ${retval} -eq 1 ]] && return 1	[[ ${retval} -eq 1 ]] && return 1
121	if [[ ${retval} -eq 0 ]]	if [[ ${retval} -eq 0 ]]
#	Line 127  dialog_setup_system_menu()	Line 123  dialog_setup_system_menu()
123	case "${mode}" in	case "${mode}" in
124	"1") run_install_auto ;;	"1") run_install_auto ;;
125	"2") run_install_normal ;;	"2") run_install_normal ;;
126	"") dialog_setup_system_menu;;	"") task_setup_system_menu;;
127	esac	esac
128	fi	fi
129	}	}
#	Line 249  dialog_main()	Line 245  dialog_main()
245	if [[ ${retval} -eq 0 ]]	if [[ ${retval} -eq 0 ]]
246	then	then
247	case ${method} in	case ${method} in
248	"1") dialog_setup_system_menu ;;	"1") task_setup_system_menu ;;
249	"2") dialog_hardware_detection ;;	"2") dialog_hardware_detection ;;
250	"3") install_do_reboot ;;	"3") install_do_reboot ;;
251	"4") /bin/bash --login -i ;;	"4") /bin/bash --login -i ;;

---

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

Legend: Removed from v.2474   changed lines   Added in v.2475