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

Parent Directory | Revision Log | Patch

	revision 2416 by niro, Tue Jan 7 13:37:49 2014 UTC	revision 2424 by niro, Tue Jan 7 13:56:51 2014 UTC
#	Line 146  dialog_setup_system_menu()	Line 146  dialog_setup_system_menu()
146
147	dialog_hardware_detection()	dialog_hardware_detection()
148	{	{
149	local i	local message
	local hwtmp
	if [ -x $(type -P mktemp) ]
	then
	hwtmp="$(mktemp)"
	else
	hwtmp="/tmp/hwtmp.sh"
	fi
150
151	run_hardware_detection_disks	run_hardware_detection_disks
152
153	echo "dialog \\"  > ${hwtmp}	message+=$"Harddrives:\n"
	echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}
	echo "--ok-label \"Weiter\" \\" >> ${hwtmp}
	echo "--stdout \\" >> ${hwtmp}
	echo "--colors \\" >> ${hwtmp}
	echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}
	echo " Festplatten:\n \\" >> ${hwtmp}
154
155	if [[ ! -z ${ALL_DISKS} ]]	if [[ ! -z ${ALL_DISKS} ]]
156	then	then
157	for i in ${ALL_DISKS}	for i in ${ALL_DISKS}
158	do	do
159	echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp}	message+="\Z3${i}\Zn "
160	done	done
161		message+="\n"
162	fi	fi
163
164	if [[ ! -z ${ALL_CDROMS} ]]	if [[ ! -z ${ALL_CDROMS} ]]
165	then	then
166	echo " \n \\" >> ${hwtmp}	message+="\n"
167	echo " CDROM Laufwerke:\n \\" >> ${hwtmp}	message+=$"Optical disk drives:\n"
168	for i in ${ALL_CDROMS}	for i in ${ALL_CDROMS}
169	do	do
170	echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp}	message+="\Z3${i}\Zn"
171	done	done
172		message+="\n"
173	fi	fi
174
175	# other devices	# other devices
176	run_hardware_detection	run_hardware_detection
177	case "${SPECIALDEVICE}" in	case "${SPECIALDEVICE}" in
178	zotac*) echo " \n\n\n \\Z2Zotac Device erkannt.\\Zn \\" >> ${hwtmp} ;;	zotac*) message+=$"\n\Z2Zotac device detected.\Zn" ;;
179	rangee) echo " \n\n\n \\Z2Rangee Device erkannt.\\Zn \\" >> ${hwtmp} ;;	rangee) message+=$"\n\Z2Rangee device detected.\Zn" ;;
180	maxdata) echo " \n\n\n \\Z2Maxdata Device erkannt.\\Zn \\" >> ${hwtmp} ;;	maxdata) message+=$"\n\Z2Maxdata device detected.\Zn" ;;
181	*) echo " \n\n\n \\ZnStandard Device erkannt.\\Zn \\" >> ${hwtmp} ;;	*) message+=$"\n \\ZnCommon device detected.\Zn" ;;
182	esac	esac
183	if [[ ${FORMFACTOR} = laptop ]]	if [[ ${FORMFACTOR} = laptop ]]
184	then	then
185	echo " \n \\ZnFormfactor Laptop, Powersave Modus 'ondemand' wird aktiviert.\\Zn \\" >> ${hwtmp}	message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving  mode.\Zn"
186	fi	fi
187
188	echo " \" 14 70" >> ${hwtmp}	messagebox -y 15 -h $"Detected hardware:" "${message}"
	chmod a+x ${hwtmp}
	${hwtmp}
	# remove tmp file
	if [[ -f ${hwtmp} ]]
	then
	rm ${hwtmp}
	fi
189	}	}
190
191	dialog_setup_hdd_partitions_manual()	dialog_setup_hdd_partitions_manual()
192	{	{
193	local i	local i
194		local retval
195
196	if [[ -z ${installdevs} ]]	if [[ -z ${ALL_DISKS} ]]
197	then	then
198	dialog \	dialog_no_harddrive_found
	--backtitle "${TITLE}" \
	--ok-label "Beenden" \
	--msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70
199	exit 1	exit 1
200	else	else
201		HDD=$(dialog_select_target_harddrive)
202	echo "dialog \\" > /tmp/hddtmp.sh	retval=$?
203	echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh	[[ ${retval} -eq 1 ]] && return 1
204	echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh	if [[ ${retval} -eq 0 ]]
	echo "--cancel-label \"Beenden\" \\" >> /tmp/hddtmp.sh
	echo "--stdout \\" >> /tmp/hddtmp.sh
	echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
	for i in ${installdevs}
	do
	echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
	done
	echo -e "\n" >> /tmp/hddtmp.sh
	chmod a+x /tmp/hddtmp.sh
	HDD="$(/tmp/hddtmp.sh)"
	RES=$?
	[[ ${RES} -eq 1 ]] && return 1
	if [[ ${RES} -eq 0 ]]
205	then	then
206	dialog_setup_hdd_info	dialog_setup_hdd_info
207	setup_hdd_partitions_manual	setup_hdd_partitions_manual
#	Line 249  dialog_setup_hdd_partitions_manual()	Line 212  dialog_setup_hdd_partitions_manual()
212	dialog_setup_hdd_partitions_auto()	dialog_setup_hdd_partitions_auto()
213	{	{
214	local i	local i
215		local retval
216
217	if [[ -z ${installdevs} ]]	if [[ -z ${ALL_DISKS} ]]
218	then	then
219	dialog \	dialog_no_harddrive_found
	--backtitle "${TITLE}" \
	--ok-label "Beenden" \
	--msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70
220	exit 1	exit 1
221	else	else
222		HDD=$(dialog_select_target_harddrive)
223	echo "dialog \\" > /tmp/hddtmp.sh	retval=$?
224	echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh	[[ ${retval} -eq 1 ]] && return 1
225	echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh	if [[ ${retval} -eq 0 ]]
	echo "--cancel-label \"Beenden\" \\" >> /tmp/hddtmp.sh
	echo "--stdout \\" >> /tmp/hddtmp.sh
	echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
	for i in ${installdevs}
	do
	echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
	done
	echo -e "\n" >> /tmp/hddtmp.sh
	chmod a+x /tmp/hddtmp.sh
	HDD="$(/tmp/hddtmp.sh)"
	RES=$?
	[[ ${RES} -eq 1 ]] && return 1
	if [[ ${RES} -eq 0 ]]
226	then	then
227	dialog_setup_hdd_info_auto	dialog_setup_hdd_info_auto
228	dialog_setup_hdd_create_partitions	dialog_setup_hdd_create_partitions
#	Line 328  dialog_install_system_image()	Line 274  dialog_install_system_image()
274	--gauge "Kopiere System-Image ..." 6 80	--gauge "Kopiere System-Image ..." 6 80
275	}	}
276
277	dialog_install_meter()	install_meter()
278	{	{
279	while [[ ${CURRENTLINE} != ${TOTALLINES} ]]	while [[ ${CURRENTLINE} != ${TOTALLINES} ]]
280	do	do
#	Line 369  dialog_install_failure()	Line 315  dialog_install_failure()
315
316	dialog_main()	dialog_main()
317	{	{
318	METHOD=0	local method=0
319		local retval
320
321	while [[ ${METHOD} -le 2 ]]	while [[ ${method} -le 2 ]]
322	do	do
323	METHOD=$(dialog \	method=$(dialog \
324	--backtitle "${TITLE}" \	--backtitle "${TITLE}" \
325	--no-cancel \	--no-cancel \
326	--ok-label "Weiter" \	--ok-label "Weiter" \
#	Line 383  dialog_main()	Line 330  dialog_main()
330	"2" "Uebersicht gefundener Laufwerke" \	"2" "Uebersicht gefundener Laufwerke" \
331	"3" "Beenden und neustarten" \	"3" "Beenden und neustarten" \
332	"4" "Beenden und eine Shell starten")	"4" "Beenden und eine Shell starten")
333	RES=$?	retval=$?
334	[[ ${RES} -eq 1 ]] && exit 1	[[ ${retval} -eq 1 ]] && exit 1
335	if [[ ${RES} -eq 0 ]]	if [[ ${retval} -eq 0 ]]
336	then	then
337	case ${METHOD} in	case ${method} in
338	"1") dialog_setup_system_menu ;;	"1") dialog_setup_system_menu ;;
339	"2") dialog_hardware_detection ;;	"2") dialog_hardware_detection ;;
340	"3") install_do_reboot ;;	"3") install_do_reboot ;;
#	Line 822  run_install_normal()	Line 769  run_install_normal()
769	dialog_setup_hdd_format	dialog_setup_hdd_format
770	setup_hdd_format > /dev/null	setup_hdd_format > /dev/null
771	install_mount_rootfs	install_mount_rootfs
772	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image
773
774	dialog_install_settings	dialog_install_settings
775	sleep 1	sleep 1
#	Line 844  run_install_auto()	Line 791  run_install_auto()
791	dialog_setup_hdd_format	dialog_setup_hdd_format
792	setup_hdd_format > /dev/null	setup_hdd_format > /dev/null
793	install_mount_rootfs	install_mount_rootfs
794	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image
795
796	dialog_install_settings	dialog_install_settings
797	sleep 1	sleep 1

---

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

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