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

Parent Directory | Revision Log | Patch

	revision 2428 by niro, Tue Jan 7 14:11:12 2014 UTC	revision 2429 by niro, Tue Jan 7 14:13:11 2014 UTC
#	Line 233  dialog_setup_hdd_partitions_auto()	Line 233  dialog_setup_hdd_partitions_auto()
233	fi	fi
234	}	}
235
	run_hardware_detection_disks()
	{
	local bootdev
	# all disks but exclude ramdisks
	export ALL_DISKS=$(get_hwinfo disk | sed '/\/dev\/ram[0-9].*/d')
	# remove the boot device from ALL_DISKS if it was an usbstick
	if [[ $(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f3) != iso9660 ]]
	then
	bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')"
	export ALL_DISKS=$(echo "${ALL_DISKS}" | grep -v "${bootdev}")
	fi
	export ALL_CDROMS="$(get_hwinfo cdrom)"
	}
236	install_meter()	install_meter()
237	{	{
238	while [[ ${CURRENTLINE} != ${TOTALLINES} ]]	while [[ ${CURRENTLINE} != ${TOTALLINES} ]]
#	Line 347  run_hardware_detection()	Line 332  run_hardware_detection()
332	fi	fi
333	}	}
334
335		run_hardware_detection_disks()
336		{
337		local bootdev
338
339		# all disks but exclude ramdisks
340		export ALL_DISKS=$(get_hwinfo disk | sed '/\/dev\/ram[0-9].*/d')
341		# remove the boot device from ALL_DISKS if it was an usbstick
342		if [[ $(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f3) != iso9660 ]]
343		then
344		bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')"
345		export ALL_DISKS=$(echo "${ALL_DISKS}" | grep -v "${bootdev}")
346		fi
347		export ALL_CDROMS="$(get_hwinfo cdrom)"
348		}
349
350	hdd_size_below_256mb()	hdd_size_below_256mb()
351	{	{
352	local hdd="$1"	local hdd="$1"

---

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

Legend: Removed from v.2428   changed lines   Added in v.2429