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

Parent Directory | Revision Log | Patch

	revision 2419 by niro, Tue Jan 7 13:44:59 2014 UTC	revision 2430 by niro, Tue Jan 7 14:14:23 2014 UTC
#	Line 27  for inc in %SYSCONFDIR%/installer.conf \	Line 27  for inc in %SYSCONFDIR%/installer.conf \
27	${INSTALLER_LIBDIR}/functions/common.sh \	${INSTALLER_LIBDIR}/functions/common.sh \
28	${INSTALLER_LIBDIR}/functions/common-dialogs.sh \	${INSTALLER_LIBDIR}/functions/common-dialogs.sh \
29	${INSTALLER_LIBDIR}/functions/hwdetection.sh \	${INSTALLER_LIBDIR}/functions/hwdetection.sh \
30		${INSTALLER_LIBDIR}/functions/bootloader.sh \
31		${INSTALLER_LIBDIR}/functions/initrd-tools.sh \
32	${INSTALLER_LIBDIR}/functions/installer-dialogs.sh	${INSTALLER_LIBDIR}/functions/installer-dialogs.sh
33	do	do
34	if [ -e ${inc} ]	if [ -e ${inc} ]
#	Line 191  dialog_hardware_detection()	Line 193  dialog_hardware_detection()
193	dialog_setup_hdd_partitions_manual()	dialog_setup_hdd_partitions_manual()
194	{	{
195	local i	local i
196		local retval
197
198	if [[ -z ${ALL_DISKS} ]]	if [[ -z ${ALL_DISKS} ]]
199	then	then
200	dialog \	dialog_no_harddrive_found
	--backtitle "${TITLE}" \
	--ok-label "Beenden" \
	--msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70
201	exit 1	exit 1
202	else	else
203		HDD=$(dialog_select_target_harddrive)
204	echo "dialog \\" > /tmp/hddtmp.sh	retval=$?
205	echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh	[[ ${retval} -eq 1 ]] && return 1
206	echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh	if [[ ${retval} -eq 0 ]]
	echo "--cancel-label \"Beenden\" \\" >> /tmp/hddtmp.sh
	echo "--stdout \\" >> /tmp/hddtmp.sh
	echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
	for i in ${ALL_DISKS}
	do
	echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
	done
	echo -e "\n" >> /tmp/hddtmp.sh
	chmod a+x /tmp/hddtmp.sh
	HDD="$(/tmp/hddtmp.sh)"
	RES=$?
	[[ ${RES} -eq 1 ]] && return 1
	if [[ ${RES} -eq 0 ]]
207	then	then
208	dialog_setup_hdd_info	dialog_setup_hdd_info
209	setup_hdd_partitions_manual	setup_hdd_partitions_manual
#	Line 229  dialog_setup_hdd_partitions_manual()	Line 214  dialog_setup_hdd_partitions_manual()
214	dialog_setup_hdd_partitions_auto()	dialog_setup_hdd_partitions_auto()
215	{	{
216	local i	local i
217		local retval
218
219	if [[ -z ${ALL_DISKS} ]]	if [[ -z ${ALL_DISKS} ]]
220	then	then
221	dialog \	dialog_no_harddrive_found
	--backtitle "${TITLE}" \
	--ok-label "Beenden" \
	--msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70
222	exit 1	exit 1
223	else	else
224		HDD=$(dialog_select_target_harddrive)
225	echo "dialog \\" > /tmp/hddtmp.sh	retval=$?
226	echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh	[[ ${retval} -eq 1 ]] && return 1
227	echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh	if [[ ${retval} -eq 0 ]]
	echo "--cancel-label \"Beenden\" \\" >> /tmp/hddtmp.sh
	echo "--stdout \\" >> /tmp/hddtmp.sh
	echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
	for i in ${ALL_DISKS}
	do
	echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
	done
	echo -e "\n" >> /tmp/hddtmp.sh
	chmod a+x /tmp/hddtmp.sh
	HDD="$(/tmp/hddtmp.sh)"
	RES=$?
	[[ ${RES} -eq 1 ]] && return 1
	if [[ ${RES} -eq 0 ]]
228	then	then
229	dialog_setup_hdd_info_auto	dialog_setup_hdd_info_auto
230	dialog_setup_hdd_create_partitions	dialog_setup_hdd_create_partitions
#	Line 265  dialog_setup_hdd_partitions_auto()	Line 233  dialog_setup_hdd_partitions_auto()
233	fi	fi
234	}	}
235
236	run_hardware_detection_disks()	install_meter()
	{
	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)"
	}
	dialog_setup_hdd_create_partitions()
	{
	dialog \
	--backtitle "${TITLE}" \
	--infobox "Erstelle Disk Partitionen ..." 3 70
	}
	dialog_setup_hdd_format()
	{
	dialog \
	--backtitle "${TITLE}" \
	--infobox "Erstelle Datei-Systeme ..." 3 70
	}
	dialog_install_settings()
	{
	dialog \
	--backtitle "${TITLE}" \
	--infobox "Speichere System-Einstellungen ..." 3 70
	}
	dialog_install_system_image()
	{
	dialog \
	--backtitle "${TITLE}" \
	--gauge "Kopiere System-Image ..." 6 80
	}
	dialog_install_meter()
237	{	{
238	while [[ ${CURRENTLINE} != ${TOTALLINES} ]]	while [[ ${CURRENTLINE} != ${TOTALLINES} ]]
239	do	do
#	Line 321  dialog_install_meter()	Line 246  dialog_install_meter()
246	return 0	return 0
247	}	}
248
	dialog_install_bootsector()
	{
	dialog \
	--backtitle "${TITLE}" \
	--infobox "Schreibe den Bootsektor ..." 3 70
	}
	dialog_install_successful()
	{
	dialog \
	--backtitle "${TITLE}" \
	--colors \
	--msgbox "Die Installation war \Z2erfolgreich\Zn." 5 81
	}
	dialog_install_failure()
	{
	dialog \
	--backtitle "${TITLE}" \
	--colors \
	--msgbox "Die Installation ist \Z1Fehlgeschlagen\Zn.\n\n\
	Fehler bei ${ERROR}, RetVal: ${RETVAL} \
	" 10 81
	}
249	dialog_main()	dialog_main()
250	{	{
251	METHOD=0	local method=0
252		local retval
253
254	while [[ ${METHOD} -le 2 ]]	while [[ ${method} -le 2 ]]
255	do	do
256	METHOD=$(dialog \	method=$(menubox $"Configuration:" \
257	--backtitle "${TITLE}" \	$"1:Install system" \
258	--no-cancel \	$"2:Show detected harddrives" \
259	--ok-label "Weiter" \	$"3:Exit and reboot" \
260	--stdout \	$"4:Exit and drop into a shell")
261	--menu "Konfiguration" 14 70 5 \	retval=$?
262	"1" "AutoSta_LX installieren" \	[[ ${retval} -eq 1 ]] && exit 1
263	"2" "Uebersicht gefundener Laufwerke" \	if [[ ${retval} -eq 0 ]]
	"3" "Beenden und neustarten" \
	"4" "Beenden und eine Shell starten")
	RES=$?
	[[ ${RES} -eq 1 ]] && exit 1
	if [[ ${RES} -eq 0 ]]
264	then	then
265	case ${METHOD} in	case ${method} in
266	"1") dialog_setup_system_menu ;;	"1") dialog_setup_system_menu ;;
267	"2") dialog_hardware_detection ;;	"2") dialog_hardware_detection ;;
268	"3") install_do_reboot ;;	"3") install_do_reboot ;;
#	Line 386  run_hardware_detection()	Line 281  run_hardware_detection()
281
282	hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"	hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"
283
284	# check for special devices/clients:	## check for special devices/clients:
285	# if zotac a zotac and the disk is a removeable device, then add rootdelay to kernelcmd	## if zotac a zotac and the disk is a removeable device, then add rootdelay to kernelcmd
286	local removable=0	#local removable=0
287	if [[ ! -z $(echo "${hwinfo}" | grep -i zotac) ]]	#if [[ ! -z $(echo "${hwinfo}" | grep -i zotac) ]]
288	then	#then
289	for i in /sys/block/[hs]d*/removable	#for i in /sys/block/[hs]d*/removable
290	do	#do
291	if [[ $(< ${i}) = 1 ]]	#if [[ $(< ${i}) = 1 ]]
292	then	#then
293	removable=1	#removable=1
294	fi	#fi
295	done	#done
296
297	# only add this for grub legacy, grub2 detect these settings on its own	## only add this for grub legacy, grub2 detect these settings on its own
298	export GRUBLEGACYOPTS="rootdelay=8"	#export GRUBLEGACYOPTS="rootdelay=8"
299	# there are to zotac types in the wild, nvidia based gfx and intel	## there are to zotac types in the wild, nvidia based gfx and intel
300	if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]	#if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]
301	then	#then
302	export SPECIALDEVICE="zotac_nvidia"	#export SPECIALDEVICE="zotac_nvidia"
303	else	#else
304	export SPECIALDEVICE="zotac_intel"	#export SPECIALDEVICE="zotac_intel"
305	fi	#fi
306	fi	#fi
307
308	# check for special devices/clients:	# check for special devices/clients:
309	# if a rangee and disk ist smaller then 256mb move partion one block further ahead	# if a rangee and disk ist smaller then 256mb move partion one block further ahead
#	Line 437  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"
#	Line 802  run_install_normal()	Line 712  run_install_normal()
712	dialog_setup_hdd_format	dialog_setup_hdd_format
713	setup_hdd_format > /dev/null	setup_hdd_format > /dev/null
714	install_mount_rootfs	install_mount_rootfs
715	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image
716
717	dialog_install_settings	dialog_install_settings
718	sleep 1	sleep 1
719	install_system_settings	install_system_settings
720		dialog_install_initrd
721	install_initrd_chroot	install_initrd_chroot
722
723	dialog_install_bootsector	dialog_install_bootsector
#	Line 824  run_install_auto()	Line 735  run_install_auto()
735	dialog_setup_hdd_format	dialog_setup_hdd_format
736	setup_hdd_format > /dev/null	setup_hdd_format > /dev/null
737	install_mount_rootfs	install_mount_rootfs
738	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image
739
740	dialog_install_settings	dialog_install_settings
741	sleep 1	sleep 1
742	install_system_settings	install_system_settings
743		dialog_install_initrd
744	install_initrd_chroot	install_initrd_chroot
745
746	dialog_install_bootsector	dialog_install_bootsector

---

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

Legend: Removed from v.2419   changed lines   Added in v.2430