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

Parent Directory | Revision Log | Patch

	revision 2882 by niro, Fri Jul 31 09:39:45 2015 UTC	revision 2884 by niro, Fri Jul 31 09:54:20 2015 UTC
#	Line 99  install_meter()	Line 99  install_meter()
99	return 0	return 0
100	}	}
101
	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
	}
102	mount_rootfs()	mount_rootfs()
103	{	{
104	local retval	local retval
#	Line 337  EOF	Line 315  EOF
315
316	setup_hdd_format()	setup_hdd_format()
317	{	{
318		install -d /tmp
319		:> /tmp/format.log
320
321	if [[ -n ${SWAPHDD} ]]	if [[ -n ${SWAPHDD} ]]
322	then	then
323	# sanity check - should not happen	# sanity check - should not happen
#	Line 357  setup_hdd_format()	Line 338  setup_hdd_format()
338	umount "${BOOTHDD}"	umount "${BOOTHDD}"
339	fi	fi
340
341	mkfs."${FORMAT_FILESYSTEM}" -q "${BOOTHDD}" || dialog_die	mkfs."${FORMAT_FILESYSTEM}" "${BOOTHDD}" &>> /tmp/format.log || dialog_die
342	fi	fi
343
344	if [[ -n ${ROOTHDD} ]]	if [[ -n ${ROOTHDD} ]]
#	Line 369  setup_hdd_format()	Line 350  setup_hdd_format()
350	umount "${ROOTHDD}"	umount "${ROOTHDD}"
351	fi	fi
352
353	mkfs."${FORMAT_FILESYSTEM}" -q "${ROOTHDD}" || dialog_die	mkfs."${FORMAT_FILESYSTEM}" "${ROOTHDD}" &>> /tmp/format.log || dialog_die
354	fi	fi
355	}	}
356

---

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

Legend: Removed from v.2882   changed lines   Added in v.2884