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

Parent Directory | Revision Log | Patch

	revision 2883 by niro, Fri Jul 31 09:42:12 2015 UTC	revision 2889 by niro, Fri Jul 31 10:55:16 2015 UTC
#	Line 81  trap_exit()	Line 81  trap_exit()
81	is_mounted --location "${INSTALLROOT}/sys" && umount ${INSTALLROOT}/sys	is_mounted --location "${INSTALLROOT}/sys" && umount ${INSTALLROOT}/sys
82	is_mounted --location "${INSTALLROOT}/boot" && umount ${INSTALLROOT}/boot	is_mounted --location "${INSTALLROOT}/boot" && umount ${INSTALLROOT}/boot
83	is_mounted --location "${INSTALLROOT}" && umount ${INSTALLROOT}	is_mounted --location "${INSTALLROOT}" && umount ${INSTALLROOT}
84		[[ -n ${SWAPHDD} ]] && swapoff ${SWAPHDD}
85
86	echo $"Installation aborted."	echo $"Installation aborted."
87	exit 1	exit 1
#	Line 99  install_meter()	Line 100  install_meter()
100	return 0	return 0
101	}	}
102
	install_mount_rootfs()
	{
	local opts
	if [[ -n ${SWAPHDD} ]]
	then
	swapon ${SWAPHDD} || die
	fi
	if [[ -n ${ROOTHDD} ]]
	then
	mount -t ${FORMAT_FILESYSTEM_ROOTHDD} ${ROOTHDD} ${INSTALL_ROOT} || die
	fi
	if [[ -n ${BOOTHDD} ]]
	then
	install -d ${INSTALL_ROOT}/boot || die
	mount -t ${FORMAT_FILESYSTEM_BOOTHDD} ${BOOTHDD} ${INSTALL_ROOT}/boot || die
	fi
	cd ${INSTALL_ROOT} || die
	}
103	mount_rootfs()	mount_rootfs()
104	{	{
105	local retval	local retval
#	Line 136  mount_rootfs()	Line 115  mount_rootfs()
115	then	then
116	echo $"${INSTALLROOT} already mounted" >&2	echo $"${INSTALLROOT} already mounted" >&2
117	else	else
118	mount "${ROOTHDD}" "${INSTALLROOT}" || dialog_die $"Could not mount rootfs - drive '${ROOTHDD}' -> '${INSTALLROOT}'"	mount -t "${FORMAT_FILESYSTEM_ROOTHDD}" "${ROOTHDD}" "${INSTALLROOT}" || dialog_die $"Could not mount rootfs - drive '${ROOTHDD}' -> '${INSTALLROOT}'"
119	fi	fi
120	fi	fi
121
#	Line 148  mount_rootfs()	Line 127  mount_rootfs()
127	then	then
128	echo $"${INSTALLROOT}/boot already mounted" >&2	echo $"${INSTALLROOT}/boot already mounted" >&2
129	else	else
130	mount "${BOOTHDD}" "${INSTALLROOT}"/boot || dialog_die $"Could not mount bootfs - drive '${BOOTHDD}' -> '${INSTALLROOT}/boot'"	mount -t "${FORMAT_FILESYSTEM_BOOTHDD}" "${BOOTHDD}" "${INSTALLROOT}"/boot || dialog_die $"Could not mount bootfs - drive '${BOOTHDD}' -> '${INSTALLROOT}/boot'"
131	fi	fi
132	fi	fi
133	}	}
#	Line 244  run_hardware_detection_disks()	Line 223  run_hardware_detection_disks()
223
224	setup_hdd_partitions()	setup_hdd_partitions()
225	{	{
	case "${INSTALL_METHOD}" in
	auto)
	BOOTHDD=""
	SWAPHDD=""
	ROOTHDD="${HDD}1"
	;;
	normal)
	BOOTHDD="${HDD}1"
	SWAPHDD="${HDD}2"
	ROOTHDD="${HDD}3"
	;;
	esac
226	# sanity check - should not happen	# sanity check - should not happen
227	if is_mounted --device "${ROOTHDD}"	if is_mounted --device "${ROOTHDD}"
228	then	then
#	Line 360  setup_hdd_format()	Line 326  setup_hdd_format()
326	umount "${BOOTHDD}"	umount "${BOOTHDD}"
327	fi	fi
328
329	mkfs."${FORMAT_FILESYSTEM}" "${BOOTHDD}" &>> /tmp/format.log || dialog_die	mkfs."${FORMAT_FILESYSTEM_BOOTHDD}" "${BOOTHDD}" &>> /tmp/format.log || dialog_die
330	fi	fi
331
332	if [[ -n ${ROOTHDD} ]]	if [[ -n ${ROOTHDD} ]]
#	Line 372  setup_hdd_format()	Line 338  setup_hdd_format()
338	umount "${ROOTHDD}"	umount "${ROOTHDD}"
339	fi	fi
340
341	mkfs."${FORMAT_FILESYSTEM}" "${ROOTHDD}" &>> /tmp/format.log || dialog_die	mkfs."${FORMAT_FILESYSTEM_ROOTHDD}" "${ROOTHDD}" &>> /tmp/format.log || dialog_die
342	fi	fi
343	}	}
344
#	Line 392  install_system_settings()	Line 358  install_system_settings()
358	clearconfig	clearconfig
359	if [[ -n ${BOOTHDD} ]]	if [[ -n ${BOOTHDD} ]]
360	then	then
361	addconfig -e "UUID=$(get_uuid ${BOOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t1 1"	addconfig -e "UUID=$(get_uuid ${BOOTHDD})\t/\t${FORMAT_FILESYSTEM_BOOTHDD}\tnoatime\t1 1"
362	fi	fi
363	if [[ -n ${ROOTHDD} ]]	if [[ -n ${ROOTHDD} ]]
364	then	then
365	addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0"	addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM_ROOTHDD}\tnoatime\t0 0"
366	fi	fi
367	if [[ -n ${SWAPHDD} ]]	if [[ -n ${SWAPHDD} ]]
368	then	then
#	Line 564  run_install()	Line 530  run_install()
530
531	case "${method}" in	case "${method}" in
532	auto)	auto)
533		export BOOTHDD=""
534		export SWAPHDD=""
535		export ROOTHDD="${HDD}1"
536		export FORMAT_FILESYSTEM_BOOTHDD=""
537		export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
538	export INSTALL_METHOD="${method}"	export INSTALL_METHOD="${method}"
539	;;	;;
540	normal)	normal)
541		export BOOTHDD="${HDD}1"
542		export SWAPHDD="${HDD}2"
543		export ROOTHDD="${HDD}3"
544		export FORMAT_FILESYSTEM_BOOTHDD="${FORMAT_FILESYSTEM}"
545		export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
546		export INSTALL_METHOD="${method}"
547		;;
548		single)
549		export BOOTHDD=""
550		export SWAPHDD=""
551		export ROOTHDD="${HDD}1"
552		export FORMAT_FILESYSTEM_BOOTHDD=""
553		export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
554		export INSTALL_METHOD="${method}"
555		;;
556		flash)
557		export BOOTHDD="${HDD}1"
558		export SWAPHDD=""
559		export ROOTHDD="${HDD}2"
560		export FORMAT_FILESYSTEM_BOOTHDD="${FORMAT_FILESYSTEM}"
561		export FORMAT_FILESYSTEM_ROOTHDD="f2fs"
562	export INSTALL_METHOD="${method}"	export INSTALL_METHOD="${method}"
563	;;	;;
564	*)	*)

---

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

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