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 2642 by niro, Wed Apr 2 11:28:21 2014 UTC
#	Line 9	Line 9
9
10	# setup locales	# setup locales
11	TEXTDOMAIN=installer	TEXTDOMAIN=installer
	LC_MESSAGES=C
12
13	# include dir	# include dir
14	INSTALLER_LIBDIR="%LIBDIR%"	INSTALLER_LIBDIR="%LIBDIR%"
#	Line 41  do	Line 40  do
40	fi	fi
41	done	done
42
	# TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !
	# -> now in images.conf
	CDIMAGENAME=""
	TOTALLINES=""
	CURRENTLINE=0
	if [ -e /mnt/cdrom/system/images.conf ]
	then
	source /mnt/cdrom/system/images.conf
	# check if all required variables are set
	[[ -z ${CDIMAGENAME} ]] && die "CDIMAGENAME is empty in /mnt/cdrom/system/images.conf"
	[[ -z ${TOTALLINES} ]] && die "TOTALLINES is empty in /mnt/cdrom/system/images.conf"
	else
	die "/mnt/cdrom/system/images.conf not found"
	fi
43	### System/Config Version	### System/Config Version
44	VERSION="%VERSIONTAG%"	VERSION="%VERSIONTAG%"
45	TITLE="${DEFAULT_TITLE} - ${VERSION}"	TITLE="${DEFAULT_TITLE} - ${VERSION}"
46
47	# some sane defaults	# some sane defaults
48	CDROOT="${DEFAULT_CDROOT}"	IMAGEROOT="${DEFAULT_IMAGEROOT}"
49	INSTALLROOT="${DEFAULT_INSTALLROOT}"	INSTALLROOT="${DEFAULT_INSTALLROOT}"
50	KERNELPKG="${DEFAULT_KERNELPKG}"	KERNELPKG="${DEFAULT_KERNELPKG}"
51	KERNELOPTS="${DEFAULT_KERNELOPTS}"	KERNELOPTS="${DEFAULT_KERNELOPTS}"
#	Line 72  SPECIALDEVICE=""	Line 56  SPECIALDEVICE=""
56	FORMFACTOR="${DEFAULT_FORMFACTOR}"	FORMFACTOR="${DEFAULT_FORMFACTOR}"
57	FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}"	FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}"
58
59	#################################################	# TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !
60	#  DIALOG BOXEN #	# -> now in images.conf
61	#################################################	CDIMAGENAME=""
62		TOTALLINES=""
63		CURRENTLINE=0
64		if [ -e ${IMAGEROOT}/images.conf ]
65		then
66		source ${IMAGEROOT}/images.conf
67		# check if all required variables are set
68		[[ -z ${CDIMAGENAME} ]] && die "CDIMAGENAME is empty in ${IMAGEROOT}/images.conf"
69		[[ -z ${TOTALLINES} ]] && die "TOTALLINES is empty in ${IMAGEROOT}/images.conf"
70		else
71		die "${IMAGEROOT}/images.conf not found"
72		fi
73
74		### helper scripts ###
75
76	trap_exit()	trap_exit()
77	{	{
#	Line 88  trap_exit()	Line 85  trap_exit()
85	exit 1	exit 1
86	}	}
87
	dialog_die()
	{
	ERROR="$1"
	RETVAL="$?"
	dialog_install_failure
	exit 1
	}
	dialog_warning()
	{
	local retval
	yesnobox $"\Z1 !!! Warning !!! \Zn\n\n\This harddrive will be irreversibly erased.\n\n\Do you want to continue ?"
	retval=$?
	if [[ ${retval} -eq 1 ]]
	then
	clear
	echo $"The process was aborted."
	exit 1
	fi
	}
	dialog_setup_system_menu()
	{
	local mode
	local retval
	mode=$(menubox -h $"[ Harddrive partitioning ]" $"\nSelect an installation mode" \
	$"1:Automatic setup (recommended)" \
	":" \
	$":\Z1Expert modes:\Zn" \
	$"2:Common IDE-disk (manual setup)")
	retval=$?
	[[ ${retval} -eq 1 ]] && return 1
	if [[ ${retval} -eq 0 ]]
	then
	case "${mode}" in
	"1") run_install_auto ;;
	"2") run_install_normal ;;
	"") dialog_setup_system_menu;;
	esac
	fi
	}
	dialog_hardware_detection()
	{
	local message
	run_hardware_detection_disks
	message+=$"Harddrives:\n"
	if [[ ! -z ${ALL_DISKS} ]]
	then
	for i in ${ALL_DISKS}
	do
	message+="\Z3${i}\Zn "
	done
	message+="\n"
	fi
	if [[ ! -z ${ALL_CDROMS} ]]
	then
	message+="\n"
	message+=$"Optical disk drives:\n"
	for i in ${ALL_CDROMS}
	do
	message+="\Z3${i}\Zn"
	done
	message+="\n"
	fi
	# other devices
	run_hardware_detection
	case "${SPECIALDEVICE}" in
	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" ;;
	esac
	if [[ ${FORMFACTOR} = laptop ]]
	then
	message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving mode.\Zn"
	fi
	messagebox -y 12 -h $"Detected hardware:" "${message}"
	}
	dialog_setup_hdd_partitions_manual()
	{
	local i
	local retval
	if [[ -z ${ALL_DISKS} ]]
	then
	dialog_no_harddrive_found
	exit 1
	else
	HDD=$(dialog_select_target_harddrive)
	retval=$?
	[[ ${retval} -eq 1 ]] && return 1
	if [[ ${retval} -eq 0 ]]
	then
	dialog_setup_hdd_info
	setup_hdd_partitions_manual
	fi
	fi
	}
	dialog_setup_hdd_partitions_auto()
	{
	local i
	local retval
	if [[ -z ${ALL_DISKS} ]]
	then
	dialog_no_harddrive_found
	exit 1
	else
	HDD=$(dialog_select_target_harddrive)
	retval=$?
	[[ ${retval} -eq 1 ]] && return 1
	if [[ ${retval} -eq 0 ]]
	then
	dialog_setup_hdd_info_auto
	dialog_setup_hdd_create_partitions
	setup_hdd_partitions_auto
	fi
	fi
	}
88	install_meter()	install_meter()
89	{	{
90	while [[ ${CURRENTLINE} != ${TOTALLINES} ]]	while [[ ${CURRENTLINE} != ${TOTALLINES} ]]
#	Line 232  install_meter()	Line 98  install_meter()
98	return 0	return 0
99	}	}
100
101	dialog_main()	mount_rootfs()
102	{	{
	local method=0
103	local retval	local retval
104
105	while [[ ${method} -le 2 ]]	if is_mounted --location "${INSTALLROOT}"
106	do	then
107	method=$(CANCEL_LABEL=$"Exit" menubox $"Configuration:" \	echo $"${INSTALLROOT} already mounted" >&2
108	$"1:Install system" \	else
109	$"2:Show detected harddrives" \	mount "${ROOTHDD}" "${INSTALLROOT}" || dialog_die $"Could not mount rootfs - drive '${ROOTHDD}' -> '${INSTALLROOT}'"
110	$"3:Exit and reboot" \	fi
111	$"4:Exit and drop into a shell")	[[ -d ${INSTALLROOT}/boot ]] || install -d ${INSTALLROOT}/boot
112	retval=$?	}
113	[[ ${retval} -eq 1 ]] && exit 1
114	if [[ ${retval} -eq 0 ]]	umount_rootfs()
115	then	{
116	case ${method} in	is_mounted --location ${INSTALLROOT}/boot && umount ${INSTALLROOT}/boot
117	"1") dialog_setup_system_menu ;;	is_mounted --location ${INSTALLROOT} && umount ${INSTALLROOT}
118	"2") dialog_hardware_detection ;;	}
119	"3") install_do_reboot ;;
120	"4") /bin/bash --login -i ;;	install_do_reboot()
121	esac	{
122	fi	reboot
	done
123	}	}
124
	#################################################
	# Install Komandos #
	#################################################
125	run_hardware_detection()	run_hardware_detection()
126	{	{
127	local hwinfo	local hwinfo
#	Line 334  run_hardware_detection_disks()	Line 195  run_hardware_detection_disks()
195	export ALL_CDROMS="$(get_hwinfo cdrom)"	export ALL_CDROMS="$(get_hwinfo cdrom)"
196	}	}
197
	hdd_size_below_256mb()
	{
	local hdd="$1"
	local size
	local retval
	[[ -z ${hdd} ]] && dialog_die "Error: get_hdd_size() no \$hdd given!"
	size=$(fdisk -l ${hdd} | grep "Disk.*${hdd}" | sed 's:.*,\ \(.*\)\ byte.*:\1:')
	if [[ ${size} -le 257000000 ]]
	then
	retval="0"
	else
	retval="1"
	fi
	return "${retval}"
	}
198	setup_hdd_partitions_auto()	setup_hdd_partitions_auto()
199	{	{
200	ROOTHDD="${HDD}1"	ROOTHDD="${HDD}1"
#	Line 366  setup_hdd_partitions_auto()	Line 209  setup_hdd_partitions_auto()
209	# run this only if FDISKPARTITIONBELOW256MB is not already 1	# run this only if FDISKPARTITIONBELOW256MB is not already 1
210	if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]	if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
211	then	then
212	if hdd_size_below_256mb ${HDD}	if device_minimum_size "${HDD}" 256
213	then	then
214	FDISKPARTIONBELOW256MB=1	FDISKPARTIONBELOW256MB=1
215	else	else
#	Line 441  setup_hdd_format()	Line 284  setup_hdd_format()
284	mkfs."${FORMAT_FILESYSTEM}" -q "${ROOTHDD}" || dialog_die	mkfs."${FORMAT_FILESYSTEM}" -q "${ROOTHDD}" || dialog_die
285	}	}
286
	install_mount_rootfs()
	{
	is_mounted --location "${INSTALLROOT}" || mount "${ROOTHDD}" "${INSTALLROOT}"
	install -d ${INSTALLROOT}/boot || dialog_die
	}
287	install_system_image()	install_system_image()
288	{	{
289	pushd ${INSTALLROOT} > /dev/null	pushd ${INSTALLROOT} > /dev/null
290	tar xvjpf ${CDROOT}/system/${CDIMAGENAME} -C ${INSTALLROOT}	tar xvjpf ${IMAGEROOT}}/${CDIMAGENAME} -C ${INSTALLROOT}
291	popd > /dev/null	popd > /dev/null
292	}	}
293
294	disabled_install_bootsector_chroot()	install_system_settings()
295	{	{
296	local my_roothdd	local CONFIG
297	local grubconf="${INSTALLROOT}/boot/grub/grub.conf"
298	local grub2conf="/boot/grub/grub.cfg"	# write fstab
299		CONFIG="${INSTALLROOT}/etc/fstab"
300		clearconfig
301		addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1"
302		addconfig -e "proc\t/proc\tproc\tdefaults\t0 0"
303		addconfig -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0"
304
305	# check for grub2	# install network config skeleton
306	if [[ -f ${INSTALLROOT}/sbin/grub-mkconfig ]]	CONFIG="${INSTALLROOT}/etc/conf.d/net.eth0"
307		clearconfig
308		addconfig 'ONBOOT="yes"'
309		addconfig 'NETWORKING="dhcp"'
310
311		# intel framebuffer quirk
312		CONFIG="${INSTALLROOT}/etc/splash/splash.conf"
313		if [ -e ${CONFIG} ] && [ -e /proc/fb ]
314	then	then
315	# needed by grub-mkconfig on the first run	if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]
	if [[ ! -f ${INSTALLROOT}/boot/grub/video.lst ]]
316	then	then
317	install -m0644 ${INSTALLROOT}/lib/grub/*/video.lst ${INSTALLROOT}/boot/grub/video.lst || dialog_die	fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')
318		[[ ${fbdev} != 0 ]] && sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${CONFIG} || dialog_die
319	fi	fi
320		fi
321		}
322
	# set kernelopts
	if [[ -f ${INSTALLROOT}/etc/conf.d/grub ]]
	then
	sed -i "s:^\(export GRUB_CMDLINE_LINUX_DEFAULT=\).*:\1\"${KERNELOPTS}\":" ${INSTALLROOT}/etc/conf.d/grub || dialog_die
	else
	CONFIG="${INSTALLROOT}/etc/conf.d/grub"
	clearconfig
	addconfig "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\""
	fi
	CONFIG="${INSTALLROOT}/root/.installrc"
	clearconfig
	# only grub 1.99
	addconfig 'type -P grub-mkdevicemap && grub-mkdevicemap'
	addconfig "grub-install --no-floppy ${HDD} &> /dev/null"
	addconfig "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null"
	addconfig "exit 0"
323
324	# grub-legacy	### installer dialogs ###
	else
	source ${INSTALLROOT}/boot/kernelversion
325
326	if [ -e ${INSTALLROOT}/etc/alx_version ]	dialog_die()
327	then	{
328	OLD_ALXVER="${ALXVER}"	ERROR="$1"
329	source ${INSTALLROOT}/etc/alx_version	RETVAL="$?"
330	KRNVER="ALX-${ALXVER}"	dialog_install_failure
331	ALXVER="${OLD_ALXVER}"	exit 1
332	fi	}
333
334	[[ -z ${KRNVER} ]] && KRNVER="AutoSta_LX"	dialog_warning()
335	[[ -z ${KRNINITRD} ]] && KRNINITRD="initrd"	{
336	[[ -z ${KRNIMG} ]] && KRNIMG="vmlinuz"	local retval
	# uuid support
	my_roothdd="UUID=$(get_uuid ${ROOTHDD})"
	CONFIG="${grubconf}"
	clearconfig
	addconfig "default 0"
	addconfig "timeout 3"
	# using current root password
	addconfig "password --md5 $(cat ${INSTALLROOT}/etc/shadow | grep root | cut -d: -f2)"
	addconfig
	addconfig "# normal boot"
	addconfig "title ${KRNVER}"
	addconfig "root (hd0,0)"
	addconfig "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}"
	if is_initrd_supported
	then
	addconfig "initrd /boot/${KRNINITRD}"
	fi
337
338	addconfig	yesnobox $"\Z1 !!! Warning !!! \Zn\n\n\This harddrive will be irreversibly erased.\n\n\Do you want to continue ?"
339	addconfig "# admin boot"	retval=$?
340	addconfig "title ${KRNVER} - Re-run hardware-detection"	if [[ ${retval} -eq 1 ]]
341	addconfig "lock"	then
342	addconfig "root (hd0,0)"	clear
343	addconfig "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} hardware-auto-detection"	echo $"The process was aborted."
344	if is_initrd_supported	exit 1
345	then	fi
346	addconfig "initrd /boot/${KRNINITRD}"	}
	fi
347
	addconfig
	addconfig "title ${KRNVER} - Reset *all* local settings"
	addconfig "lock"
	addconfig "root (hd0,0)"
	addconfig "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} alx-reset-settings"
	if is_initrd_supported
	then
	addconfig "initrd /boot/${KRNINITRD}"
	fi
348
349	# bootsector schreiben chrooted schreiben (lfs/magellan)	### installer tasks ###
	cat > ${INSTALLROOT}/root/.installrc << CHROOTEOF
	/usr/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null
	root (hd0,0)
	setup (hd0)
	quit
	EOF
	exit 0
	CHROOTEOF
	fi
350
351	# run installrc	task_setup_system_menu()
352	chrooted /bin/bash --rcfile /root/.installrc -i	{
353	rm ${INSTALLROOT}/root/.installrc	local mode
354	}	local retval
	disabled_install_initrd_chroot()
	{
	# only generate initrds if the cmd exists
	is_initrd_supported || return 0
	DISKMODS="sd_mod"
	OLDPATAMODS="amd74xx piix sis5513 via82cxxx"
	PATAMODS="ata_piix pata_amd pata_mpiix pata_oldpiix pata_sis pata_via"
	SATAMODS="sata_via sata_sis sata_nv"
	DRMMODS="i915 mga nouveau r128 radeon savage sis tdfx ttm via"
	OTHERMODS=""
	case ${SPECIALDEVICE} in
	zotac_intel) FBMODS=""; DRMMODS="i915" ;;
	zotac_nvidia) FBMODS=""; DRMMODS="nouveau" ;;
	rangee) FBMODS="" ;; ## fallback to vesafb, viafb does not run on all CLE266 boards
	# not working with kms enabled drivers -> segfaults
	#maxdata) FBMODS="i810fb" ;; ## check for maxdata / i810/ i815 Chipsets and disable KMS and use i810fb frambuffer
	maxdata) FBMODS="" ;;
	*) FBMODS="uvesafb" ;;
	esac
355
356	if [[ ${FORMFACTOR} = laptop ]]	mode="$(dialog_setup_system_menu)"
357		retval=$?
358		[[ ${retval} -eq 1 ]] && return 1
359		if [[ ${retval} -eq 0 ]]
360	then	then
361	OTHERMODS="acpi-cpufreq cpufreq_ondemand cpufreq_conservative cpufreq_powersave"	case "${mode}" in
362		"1") run_install_auto ;;
363		"2") run_install_normal ;;
364		"") task_setup_system_menu;;
365		esac
366	fi	fi
367		}
368
369	# install an appropriate uvesafb.conf	task_hardware_detection()
370	install -d ${INSTALLROOT}/etc/modprobe.d || dialog_die	{
371	CONFIG="${INSTALLROOT}/etc/modprobe.d/uvesafb.conf"	local message
	clearconfig
	addconfig "options uvesafb mode_option=1024x768-32@60 scroll=ywrap"
372
373	# install an appropriate viafb.conf	run_hardware_detection_disks
	CONFIG="${INSTALLROOT}/etc/modprobe.d/viafb.conf"
	clearconfig
	addconfig "options viafb viafb_mode=1024x768 viafb_refresh=60"
374
375	# install an appropriate i810fb.conf	message+=$"Harddrives:\n"
	CONFIG="${INSTALLROOT}/etc/modprobe.d/i810fb.conf"
	clearconfig
	addconfig "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"
376
377	cat > ${INSTALLROOT}/root/.installrc << CHROOTEOF	if [[ ! -z ${ALL_DISKS} ]]
378	echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS} ${OTHERMODS}\"" > /etc/conf.d/mkinitrd	then
379	mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g") > /dev/null	for i in ${ALL_DISKS}
380	exit 0	do
381	CHROOTEOF	message+="\Z3${i}\Zn "
382		done
383		message+="\n"
384		fi
385
386	# run installrc	if [[ ! -z ${ALL_CDROMS} ]]
387	chrooted /bin/bash --rcfile /root/.installrc -i	then
388	rm ${INSTALLROOT}/root/.installrc	message+="\n"
389	}	message+=$"Optical disk drives:\n"
390		for i in ${ALL_CDROMS}
391		do
392		message+="\Z3${i}\Zn"
393		done
394		message+="\n"
395		fi
396
397	install_system_settings()	# other devices
398	{	run_hardware_detection
399	local CONFIG	case "${SPECIALDEVICE}" in
400		zotac*) message+=$"\n\Z2Zotac device detected.\Zn" ;;
401		rangee) message+=$"\n\Z2Rangee device detected.\Zn" ;;
402		maxdata) message+=$"\n\Z2Maxdata device detected.\Zn" ;;
403		*) message+=$"\n\ZnCommon device detected.\Zn" ;;
404		esac
405		if [[ ${FORMFACTOR} = laptop ]]
406		then
407		message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving mode.\Zn"
408		fi
409
410	# write fstab	messagebox -y 12 -h $"Detected hardware:" "${message}"
411	CONFIG="${INSTALLROOT}/etc/fstab"	}
	clearconfig
	addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1"
	addconfig -e "proc\t/proc\tproc\tdefaults\t0 0"
	addconfig -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0"
412
413	# install network config skeleton	task_setup_hdd_partitions_manual()
414	CONFIG="${INSTALLROOT}/etc/conf.d/net.eth0"	{
415	clearconfig	local i
416	addconfig 'ONBOOT="yes"'	local retval
	addconfig 'NETWORKING="dhcp"'
417
418	# intel framebuffer quirk	if [[ -z ${ALL_DISKS} ]]
	if [ -e ${INSTALLROOT}/etc/splash/splash.conf ]
419	then	then
420	if [ -e /proc/fb ]	dialog_no_harddrive_found
421		exit 1
422		else
423		HDD=$(dialog_select_target_harddrive)
424		retval=$?
425		[[ ${retval} -eq 1 ]] && return 1
426		if [[ ${retval} -eq 0 ]]
427	then	then
428	if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]	dialog_setup_hdd_info
429	then	setup_hdd_partitions_manual
	fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')
	if [[ ${fbdev} != 0 ]]
	then
	sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLROOT}/etc/splash/splash.conf || dialog_die
	fi
	fi
430	fi	fi
431	fi	fi
432	}	}
433
434	install_umount_rootfs()	task_setup_hdd_partitions_auto()
435	{	{
436	is_mounted --location ${INSTALLROOT}/boot && umount ${INSTALLROOT}/boot	local i
437	is_mounted --location ${INSTALLROOT} && umount ${INSTALLROOT}	local retval
438
439		if [[ -z ${ALL_DISKS} ]]
440		then
441		dialog_no_harddrive_found
442		exit 1
443		else
444		HDD=$(dialog_select_target_harddrive)
445		retval=$?
446		[[ ${retval} -eq 1 ]] && return 1
447		if [[ ${retval} -eq 0 ]]
448		then
449		dialog_setup_hdd_info_auto
450		dialog_setup_hdd_create_partitions
451		setup_hdd_partitions_auto
452		fi
453		fi
454	}	}
455
456	install_do_reboot()	task_main()
457	{	{
458	reboot	local method=0
459	}	local retval
460
461	#################################################	while [[ ${method} -le 2 ]]
462	#     Install Ablauf Scripte #	do
463	#################################################	method=$(dialog_main)
464		retval=$?
465		[[ ${retval} -eq 1 ]] && exit 1
466		if [[ ${retval} -eq 0 ]]
467		then
468		case ${method} in
469		"1") task_setup_system_menu ;;
470		"2") task_hardware_detection ;;
471		"3") install_do_reboot ;;
472		"4") /bin/bash --login -i ;;
473		esac
474		fi
475		done
476		}
477
478	run_install_normal()	run_install_normal()
479	{	{
480	dialog_hardware_detection	task_hardware_detection
481
482	dialog_setup_hdd_partitions_manual	task_setup_hdd_partitions_manual
483	dialog_setup_hdd_format	dialog_setup_hdd_format
484	setup_hdd_format > /dev/null	setup_hdd_format > /dev/null
485	install_mount_rootfs	mount_rootfs
486	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image
487
488	dialog_install_settings	dialog_install_settings
#	Line 685  run_install_normal()	Line 499  run_install_normal()
499	bootloader_config	bootloader_config
500	bootloader_install	bootloader_install
501
502	install_umount_rootfs	umount_rootfs
503	dialog_install_successful	dialog_install_successful
504	}	}
505
506	run_install_auto()	run_install_auto()
507	{	{
508	dialog_hardware_detection	task_hardware_detection
509
510	dialog_setup_hdd_partitions_auto	task_setup_hdd_partitions_auto
511	dialog_setup_hdd_format	dialog_setup_hdd_format
512	setup_hdd_format > /dev/null	setup_hdd_format > /dev/null
513	install_mount_rootfs	mount_rootfs
514	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image
515
516	dialog_install_settings	dialog_install_settings
#	Line 713  run_install_auto()	Line 527  run_install_auto()
527	bootloader_config	bootloader_config
528	bootloader_install	bootloader_install
529
530	install_umount_rootfs	umount_rootfs
531	dialog_install_successful	dialog_install_successful
532	}	}
533
534	# set some proper traps	# set some proper traps
535	trap "trap_exit" SIGINT SIGQUIT	trap "trap_exit" SIGINT SIGQUIT
536
537	dialog_main	task_main
538
539	exit 0	exit 0

---

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

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