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

Parent Directory | Revision Log | Patch

	revision 2655 by niro, Thu Jul 3 08:33:54 2014 UTC	revision 2883 by niro, Fri Jul 31 09:42:12 2015 UTC
#	Line 99  install_meter()	Line 99  install_meter()
99	return 0	return 0
100	}	}
101
102		install_mount_rootfs()
103		{
104		local opts
105
106		if [[ -n ${SWAPHDD} ]]
107		then
108		swapon ${SWAPHDD} || die
109		fi
110		if [[ -n ${ROOTHDD} ]]
111		then
112		mount -t ${FORMAT_FILESYSTEM_ROOTHDD} ${ROOTHDD} ${INSTALL_ROOT} || die
113		fi
114		if [[ -n ${BOOTHDD} ]]
115		then
116		install -d ${INSTALL_ROOT}/boot || die
117		mount -t ${FORMAT_FILESYSTEM_BOOTHDD} ${BOOTHDD} ${INSTALL_ROOT}/boot || die
118		fi
119
120		cd ${INSTALL_ROOT} || die
121		}
122
123
124	mount_rootfs()	mount_rootfs()
125	{	{
126	local retval	local retval
127
128	if is_mounted --location "${INSTALLROOT}"	if [[ -n ${SWAPHDD} ]]
129	then	then
130	echo $"${INSTALLROOT} already mounted" >&2	swapon ${SWAPHDD} || dialog_die $"Could not enable swap space '${SWAPHDD}'"
	else
	mount "${ROOTHDD}" "${INSTALLROOT}" || dialog_die $"Could not mount rootfs - drive '${ROOTHDD}' -> '${INSTALLROOT}'"
131	fi	fi
132
133		if [[ -n ${ROOTHDD} ]]
134		then
135		if is_mounted --location "${INSTALLROOT}"
136		then
137		echo $"${INSTALLROOT} already mounted" >&2
138		else
139		mount "${ROOTHDD}" "${INSTALLROOT}" || dialog_die $"Could not mount rootfs - drive '${ROOTHDD}' -> '${INSTALLROOT}'"
140		fi
141		fi
142
143	[[ -d ${INSTALLROOT}/boot ]] || install -d ${INSTALLROOT}/boot	[[ -d ${INSTALLROOT}/boot ]] || install -d ${INSTALLROOT}/boot
144
145		if [[ -n ${BOOTHDD} ]]
146		then
147		if is_mounted --location "${INSTALLROOT}"/boot
148		then
149		echo $"${INSTALLROOT}/boot already mounted" >&2
150		else
151		mount "${BOOTHDD}" "${INSTALLROOT}"/boot || dialog_die $"Could not mount bootfs - drive '${BOOTHDD}' -> '${INSTALLROOT}/boot'"
152		fi
153		fi
154	}	}
155
156	umount_rootfs()	umount_rootfs()
157	{	{
158	is_mounted --location ${INSTALLROOT}/boot && umount ${INSTALLROOT}/boot	is_mounted --location ${INSTALLROOT}/boot && umount ${INSTALLROOT}/boot
159	is_mounted --location ${INSTALLROOT} && umount ${INSTALLROOT}	is_mounted --location ${INSTALLROOT} && umount ${INSTALLROOT}
160
161		if [[ -n ${SWAPHDD} ]]
162		then
163		swapoff ${SWAPHDD} || die
164		fi
165	}	}
166
167	install_do_reboot()	install_do_reboot()
#	Line 196  run_hardware_detection_disks()	Line 242  run_hardware_detection_disks()
242	export ALL_CDROMS="$(get_hwinfo cdrom)"	export ALL_CDROMS="$(get_hwinfo cdrom)"
243	}	}
244
245	setup_hdd_partitions_auto()	setup_hdd_partitions()
246	{	{
247	ROOTHDD="${HDD}1"	case "${INSTALL_METHOD}" in
248		auto)
249		BOOTHDD=""
250		SWAPHDD=""
251		ROOTHDD="${HDD}1"
252		;;
253		normal)
254		BOOTHDD="${HDD}1"
255		SWAPHDD="${HDD}2"
256		ROOTHDD="${HDD}3"
257		;;
258		esac
259
260	# sanity check - should not happen	# sanity check - should not happen
261	if is_mounted --device "${ROOTHDD}"	if is_mounted --device "${ROOTHDD}"
#	Line 206  setup_hdd_partitions_auto()	Line 263  setup_hdd_partitions_auto()
263	echo "partition: device ${ROOTHDD} is already mounted, umount it" >&2	echo "partition: device ${ROOTHDD} is already mounted, umount it" >&2
264	umount "${ROOTHDD}"	umount "${ROOTHDD}"
265	fi	fi
266		if [[ -n ${BOOTHDD} ]]
	# run this only if FDISKPARTITIONBELOW256MB is not already 1
	if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
267	then	then
268	if device_minimum_size "${HDD}" 256	if is_mounted --device "${BOOTHDD}"
269	then	then
270	FDISKPARTIONBELOW256MB=1	echo "partition: device ${BOOTHDD} is already mounted, umount it" >&2
271	else	umount "${BOOTHDD}"
	FDISKPARTIONBELOW256MB=0
272	fi	fi
273	fi	fi
274
275	## delete disk	if [[ ${INSTALL_METHOD} = auto ]]
	dd if=/dev/zero of=${HDD} count=1 &> /dev/null || dialog_die
	if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]
276	then	then
277	## setup one bootable partition	# run this only if FDISKPARTITIONBELOW256MB is not already 1
278	#1. n= new disk	if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
279	#2. p= primary disk	then
280	#3. 1= first partition	if device_minimum_size "${HDD}" 256
281	#4. 2= default sector start // small disk needs more space for grub2 mbr sector	then
282	#5. ''= defaul sector end	FDISKPARTIONBELOW256MB=1
283	#6. a= bootable flag	else
284	#7. 1= boot flag for partition 1	FDISKPARTIONBELOW256MB=0
285	#8. w= write/quit	fi
286	fdisk ${HDD} &> /dev/null << EOF	fi
287
288		## delete disk
289		dd if=/dev/zero of=${HDD} count=1 &> /dev/null || dialog_die
290
291		if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]
292		then
293		## setup one bootable partition
294		#1. n= new disk
295		#2. p= primary disk
296		#3. 1= first partition
297		#4. 2= default sector start // small disk needs more space for grub2 mbr sector
298		#5. ''= defaul sector end
299		#6. a= bootable flag
300		#7. 1= boot flag for partition 1
301		#8. w= write/quit
302		fdisk ${HDD} &> /dev/null << EOF
303	n	n
304	p	p
305	1	1
#	Line 242  a	Line 309  a
309	1	1
310	w	w
311	EOF	EOF
312	else	else
313	## setup one bootable partition	## setup one bootable partition
314	#1. n= new disk	#1. n= new disk
315	#2. p= primary disk	#2. p= primary disk
316	#3. 1= first partition	#3. 1= first partition
317	#4. ''= default sector start	#4. ''= default sector start
318	#5. ''= defaul sector end	#5. ''= defaul sector end
319	#6. a= bootable flag	#6. a= bootable flag
320	#7. 1= boot flag for partition 1	#7. 1= boot flag for partition 1
321	#8. w= write/quit	#8. w= write/quit
322	fdisk ${HDD} &> /dev/null << EOF	fdisk ${HDD} &> /dev/null << EOF
323	n	n
324	p	p
325	1	1
#	Line 262  a	Line 329  a
329	1	1
330	w	w
331	EOF	EOF
332		fi
333		else
334		cfdisk ${HDD} || dialog_die
335	fi	fi
336	}	}
337
	setup_hdd_partitions_manual()
	{
	ROOTHDD="${HDD}1"
	SWAPHDD=""
	BOOTHDD=""
	cfdisk ${HDD} || dialog_die
	}
338	setup_hdd_format()	setup_hdd_format()
339	{	{
340	# sanity check - should not happen	install -d /tmp
341	if is_mounted --device "${ROOTHDD}"	:> /tmp/format.log
342
343		if [[ -n ${SWAPHDD} ]]
344	then	then
345	echo "format: device ${ROOTHDD} is already mounted, umount it" >&2	# sanity check - should not happen
346	umount "${ROOTHDD}"	if is_mounted --device "${SWAPHDD}"
347		then
348		echo "format: device ${SWAPHDD} is already mounted, umount it" >&2
349		umount "${SWAPHDD}"
350		fi
351		mkswap ${SWAPHDD} || die
352		fi
353
354		if [[ -n ${BOOTHDD} ]]
355		then
356		# sanity check - should not happen
357		if is_mounted --device "${BOOTHDD}"
358		then
359		echo "format: device ${BOOTHDD} is already mounted, umount it" >&2
360		umount "${BOOTHDD}"
361		fi
362
363		mkfs."${FORMAT_FILESYSTEM}" "${BOOTHDD}" &>> /tmp/format.log || dialog_die
364	fi	fi
365
366	mkfs."${FORMAT_FILESYSTEM}" -q "${ROOTHDD}" || dialog_die	if [[ -n ${ROOTHDD} ]]
367		then
368		# sanity check - should not happen
369		if is_mounted --device "${ROOTHDD}"
370		then
371		echo "format: device ${ROOTHDD} is already mounted, umount it" >&2
372		umount "${ROOTHDD}"
373		fi
374
375		mkfs."${FORMAT_FILESYSTEM}" "${ROOTHDD}" &>> /tmp/format.log || dialog_die
376		fi
377	}	}
378
379	install_system_image()	install_system_image()
#	Line 299  install_system_settings()	Line 390  install_system_settings()
390	# write fstab	# write fstab
391	CONFIG="${INSTALLROOT}/etc/fstab"	CONFIG="${INSTALLROOT}/etc/fstab"
392	clearconfig	clearconfig
393	addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1"	if [[ -n ${BOOTHDD} ]]
394		then
395		addconfig -e "UUID=$(get_uuid ${BOOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t1 1"
396		fi
397		if [[ -n ${ROOTHDD} ]]
398		then
399		addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0"
400		fi
401		if [[ -n ${SWAPHDD} ]]
402		then
403		addconfig -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0"
404		fi
405	addconfig -e "proc\t/proc\tproc\tdefaults\t0 0"	addconfig -e "proc\t/proc\tproc\tdefaults\t0 0"
406	addconfig -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0"	addconfig -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0"
407
#	Line 360  task_setup_system_menu()	Line 462  task_setup_system_menu()
462	if [[ ${retval} -eq 0 ]]	if [[ ${retval} -eq 0 ]]
463	then	then
464	case "${mode}" in	case "${mode}" in
465	"1") run_install_auto ;;	"1") run_install auto ;;
466	"2") run_install_normal ;;	"2") run_install normal ;;
467	"") task_setup_system_menu;;	"") task_setup_system_menu;;
468	esac	esac
469	fi	fi
#	Line 411  task_hardware_detection()	Line 513  task_hardware_detection()
513	messagebox -y 12 -h $"Detected hardware:" "${message}"	messagebox -y 12 -h $"Detected hardware:" "${message}"
514	}	}
515
516	task_setup_hdd_partitions_manual()	task_setup_hdd_partitions()
517	{	{
518	local i	local i
519	local retval	local retval
#	Line 427  task_setup_hdd_partitions_manual()	Line 529  task_setup_hdd_partitions_manual()
529	if [[ ${retval} -eq 0 ]]	if [[ ${retval} -eq 0 ]]
530	then	then
531	dialog_setup_hdd_info	dialog_setup_hdd_info
532	setup_hdd_partitions_manual	setup_hdd_partitions
	fi
	fi
	}
	task_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
533	fi	fi
534	fi	fi
535	}	}
#	Line 476  task_main()	Line 556  task_main()
556	done	done
557	}	}
558
559	run_install_normal()	run_install()
560	{	{
561	task_hardware_detection	local method="$1"
562
	task_setup_hdd_partitions_manual
	dialog_setup_hdd_format
	setup_hdd_format > /dev/null
	mount_rootfs
	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image
	dialog_install_settings
	sleep 1
	install_system_settings
	if is_initrd_supported
	then
	dialog_install_initrd
	initrd_config
	initrd_install
	fi
	dialog_install_bootsector
	bootloader_config
	bootloader_install
	umount_rootfs
	dialog_install_successful
	}
	run_install_auto()
	{
563	task_hardware_detection	task_hardware_detection
564
565	task_setup_hdd_partitions_auto	case "${method}" in
566		auto)
567		export INSTALL_METHOD="${method}"
568		;;
569		normal)
570		export INSTALL_METHOD="${method}"
571		;;
572		*)
573		die "Unknown install method '${method}', aborting."
574		;;
575		esac
576
577		task_setup_hdd_partitions
578	dialog_setup_hdd_format	dialog_setup_hdd_format
579	setup_hdd_format > /dev/null	setup_hdd_format > /dev/null
580	mount_rootfs	mount_rootfs

---

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

Legend: Removed from v.2655   changed lines   Added in v.2883