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

Parent Directory | Revision Log | Patch

	revision 2652 by niro, Wed Apr 2 11:28:21 2014 UTC	revision 2653 by niro, Thu Jul 3 08:01:05 2014 UTC
#	Line 45  VERSION="%VERSIONTAG%"	Line 45  VERSION="%VERSIONTAG%"
45	TITLE="${DEFAULT_TITLE} - ${VERSION}"	TITLE="${DEFAULT_TITLE} - ${VERSION}"
46
47	# some sane defaults	# some sane defaults
48		LIVEROOT="${DEFAULT_LIVEROOT}"
49	IMAGEROOT="${DEFAULT_IMAGEROOT}"	IMAGEROOT="${DEFAULT_IMAGEROOT}"
50	INSTALLROOT="${DEFAULT_INSTALLROOT}"	INSTALLROOT="${DEFAULT_INSTALLROOT}"
51	KERNELPKG="${DEFAULT_KERNELPKG}"	KERNELPKG="${DEFAULT_KERNELPKG}"
#	Line 187  run_hardware_detection_disks()	Line 188  run_hardware_detection_disks()
188	# all disks but exclude ramdisks	# all disks but exclude ramdisks
189	export ALL_DISKS=$(get_hwinfo disk | sed '/\/dev\/ram[0-9].*/d')	export ALL_DISKS=$(get_hwinfo disk | sed '/\/dev\/ram[0-9].*/d')
190	# remove the boot device from ALL_DISKS if it was an usbstick	# remove the boot device from ALL_DISKS if it was an usbstick
191	if [[ $(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f3) != iso9660 ]]	if [[ $(grep '[[:space:]]${LIVEROOT}[[:space:]]' /proc/mounts | cut -d' ' -f3) != iso9660 ]]
192	then	then
193	bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')"	bootdev=$(grep "[[:space:]]${LIVEROOT}[[:space:]]" /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')
194	export ALL_DISKS=$(echo "${ALL_DISKS}" | grep -v "${bootdev}")	export ALL_DISKS=$(echo "${ALL_DISKS}" | grep -v "${bootdev}")
195	fi	fi
196	export ALL_CDROMS="$(get_hwinfo cdrom)"	export ALL_CDROMS="$(get_hwinfo cdrom)"

---

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

Legend: Removed from v.2652   changed lines   Added in v.2653