Diff of /alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in

Parent Directory | Revision Log | Patch

	revision 6815 by niro, Thu Jul 23 08:26:38 2015 UTC	revision 6816 by niro, Thu Jul 23 08:47:44 2015 UTC
#	Line 14	Line 14
14	# ignore environment!	# ignore environment!
15	LC_ALL=C	LC_ALL=C
16
17		MLIBDIR="/usr/lib/alxinstall-ng"
18
19	#images: (get ${CDIMAGENAME})	#images: (get ${CDIMAGENAME})
20	source /mnt/cdrom/system/images.conf	source /mnt/cdrom/system/images.conf
21
22	#Includes	# includes
23	source /usr/lib/alxinstall-ng/functions/findhdd.sh > /dev/null	source ${MLIBDIR}/functions/hwdetection.sh
	### bugfix ###############################
	cdromdev="$(echo ${cdromdev} | sed 's/ //')"
	########################################
24
25	### System/Config Version	### System/Config Version
26	VERSION="%VERSIONTAG%"	VERSION="%VERSIONTAG%"
#	Line 167  dialog_hardware_detection()	Line 166  dialog_hardware_detection()
166	hwtmp="/tmp/hwtmp.sh"	hwtmp="/tmp/hwtmp.sh"
167	fi	fi
168
169	[[ ! -z ${installdevs} ]] && installdevs=""	run_hardware_detection_disks
170
171	echo "dialog \\"  > ${hwtmp}	echo "dialog \\"  > ${hwtmp}
172	echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}	echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}
#	Line 177  dialog_hardware_detection()	Line 176  dialog_hardware_detection()
176	echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}	echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}
177	echo " Festplatten:\n \\" >> ${hwtmp}	echo " Festplatten:\n \\" >> ${hwtmp}
178
179	if [[ ! -z ${scsidisks} ]]	if [[ ! -z ${ALL_DISKS} ]]
180	then	then
181	for i in ${scsidisks}	for i in ${ALL_DISKS}
182	do	do
183	if [[ ${i} != ${cdromdev} ]]	echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp}
	then
	echo " \\Z7SCSI: \\Z3${i}\\Zn\n \\" >> ${hwtmp}
	installdevs="${installdevs} ${i}"
	fi
184	done	done
185	fi	fi
186
187	if [[ ! -z ${idedisks} ]]	if [[ ! -z ${ALL_CDROMS} ]]
188	then	then
189	for i in ${idedisks}	echo " \n \\" >> ${hwtmp}
190		echo " CDROM Laufwerke:\n \\" >> ${hwtmp}
191		for i in ${ALL_CDROMS}
192	do	do
193	if [[ ${i} != ${cdromdev} ]]	echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp}
	then
	echo " \\Z7IDE:  \\Z3${i}\\Zn\n \\" >> ${hwtmp}
	installdevs="${installdevs} ${i}"
	fi
194	done	done
195	fi	fi
196
	if [[ ! -z ${cdromdev} ]]
	then
	echo " \n \\" >> ${hwtmp}
	echo " \\Z7andere Laufwerke:\n \\" >> ${hwtmp}
	echo " CDROM: \\Z3${cdromdev}\\Zn\n \\" >> ${hwtmp}
	fi
197	# other devices	# other devices
198	run_hardware_detection	run_hardware_detection
199	case "${SPECIALDEVICE}" in	case "${SPECIALDEVICE}" in
200	zotac*) echo " \n\n\n \\Z2Zotac Device erkannt.\\Zn \\" >> ${hwtmp} ;;	zotac*) echo " \n \\Z2Zotac Device erkannt.\\Zn \\" >> ${hwtmp} ;;
201	rangee) echo " \n\n\n \\Z2Rangee Device erkannt.\\Zn \\" >> ${hwtmp} ;;	rangee) echo " \n \\Z2Rangee Device erkannt.\\Zn \\" >> ${hwtmp} ;;
202	maxdata) echo " \n\n\n \\Z2Maxdata Device erkannt.\\Zn \\" >> ${hwtmp} ;;	maxdata) echo " \n \\Z2Maxdata Device erkannt.\\Zn \\" >> ${hwtmp} ;;
203	i845) echo " \n\n\n \\Z2Intel i845 Device erkannt.\\Zn \\" >> ${hwtmp} ;;	i845) echo " \n \\Z2Intel i845 Device erkannt.\\Zn \\" >> ${hwtmp} ;;
204	*) echo " \n\n\n \\ZnStandard Device erkannt.\\Zn \\" >> ${hwtmp} ;;	*) echo " \n \\ZnStandard Device erkannt.\\Zn \\" >> ${hwtmp} ;;
205	esac	esac
206	if [[ ${FORMFACTOR} = laptop ]]	if [[ ${FORMFACTOR} = laptop ]]
207	then	then
#	Line 237  dialog_setup_hdd_partitions_manuell()	Line 223  dialog_setup_hdd_partitions_manuell()
223	{	{
224	local i	local i
225
226	if [[ -z ${installdevs} ]]	if [[ -z ${ALL_DISKS} ]]
227	then	then
228	dialog \	dialog \
229	--backtitle "${TITLE}" \	--backtitle "${TITLE}" \
#	Line 253  dialog_setup_hdd_partitions_manuell()	Line 239  dialog_setup_hdd_partitions_manuell()
239	echo "--stdout \\" >> /tmp/hddtmp.sh	echo "--stdout \\" >> /tmp/hddtmp.sh
240	echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh	echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
241
242	for i in ${installdevs}	for i in ${ALL_DISKS}
243	do	do
244	echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh	echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
245	done	done
#	Line 275  dialog_setup_hdd_partitions_manuell_simp	Line 261  dialog_setup_hdd_partitions_manuell_simp
261	{	{
262	local i	local i
263
264	if [[ -z ${installdevs} ]]	if [[ -z ${ALL_DISKS} ]]
265	then	then
266	dialog \	dialog \
267	--backtitle "${TITLE}" \	--backtitle "${TITLE}" \
#	Line 291  dialog_setup_hdd_partitions_manuell_simp	Line 277  dialog_setup_hdd_partitions_manuell_simp
277	echo "--stdout \\" >> /tmp/hddtmp.sh	echo "--stdout \\" >> /tmp/hddtmp.sh
278	echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh	echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
279
280	for i in ${installdevs}	for i in ${ALL_DISKS}
281	do	do
282	echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh	echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
283	done	done
#	Line 313  dialog_setup_hdd_partitions_auto()	Line 299  dialog_setup_hdd_partitions_auto()
299	{	{
300	local i	local i
301
302	if [[ -z ${installdevs} ]]	if [[ -z ${ALL_DISKS} ]]
303	then	then
304	dialog \	dialog \
305	--backtitle "${TITLE}" \	--backtitle "${TITLE}" \
#	Line 329  dialog_setup_hdd_partitions_auto()	Line 315  dialog_setup_hdd_partitions_auto()
315	echo "--stdout \\" >> /tmp/hddtmp.sh	echo "--stdout \\" >> /tmp/hddtmp.sh
316	echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh	echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
317
318	for i in ${installdevs}	for i in ${ALL_DISKS}
319	do	do
320	echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh	echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
321	done	done
#	Line 523  run_hardware_detection()	Line 509  run_hardware_detection()
509	fi	fi
510	}	}
511
512		run_hardware_detection_disks()
513		{
514		local bootdev
515
516		# all disks but exclude ramdisks
517		export ALL_DISKS=$(get_hwinfo disk | sed '/\/dev\/ram[0-9].*/d')
518		# remove the boot device from ALL_DISKS if it was an usbstick
519		if [[ $(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f3) != iso9660 ]]
520		then
521		bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')"
522		export ALL_DISKS=$(echo "${ALL_DISKS}" | grep -v "${bootdev}")
523		fi
524		export ALL_CDROMS="$(get_hwinfo cdrom)"
525		}
526
527	hdd_size_below_256mb()	hdd_size_below_256mb()
528	{	{
529	local hdd="$1"	local hdd="$1"

---

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

Legend: Removed from v.6815   changed lines   Added in v.6816