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

Parent Directory | Revision Log | Patch

	revision 5004 by niro, Wed Aug 7 10:52:40 2013 UTC	revision 6827 by niro, Thu Jul 23 11:37:03 2015 UTC
#	Line 1	Line 1
1	#!/bin/sh	#!/bin/sh
2	#	# $Id$
	# $Header: /home/cvsd/alx-cvs/alx-src/alxinstall-ng/bin/alxinstall-ng.sh,v 1.15 2008-06-28 00:37:45 niro Exp $
	#
	# AutoSta_LX Installation Script
	#
	# Niels Rogalla <niro@magellan-linux.de>
	# <rogalla@augusta-bochum.de>
	#
	#
	# Install Navigation Gui
	#
3
4	#images: (get ${CDIMAGENAME})	# ignore environment!
5		LC_ALL=C
6
7		MLIBDIR="/usr/lib/alxinstall-ng"
8
9		# images: (get ${CDIMAGENAME})
10	source /mnt/cdrom/system/images.conf	source /mnt/cdrom/system/images.conf
11
12	#Includes	# includes
13	source /usr/lib/alxinstall-ng/functions/findhdd.sh > /dev/null	source ${MLIBDIR}/functions/hwdetection.sh
	### bugfix ###############################
	cdromdev="$(echo ${cdromdev} | sed 's/ //')"
	########################################
14
15	### System/Config Version	### System/Config Version
16	VERSION="%VERSIONTAG%"	VERSION="@@VERSION@@"
17	TITLE="alxinstall-ng - ${VERSION}"	TITLE="alxinstall-ng - ${VERSION}"
18
19		# locations
20	CDPATH="/mnt/cdrom"	CDPATH="/mnt/cdrom"
21	INSTALLPATH="/mnt/magellan"	INSTALLPATH="/mnt/magellan"
22
23	### WICHTIG: anzahl lines in der autosta_lx.tar.gz -1	# default system settings
	CURRENTLINE=0
	#TOTALLINES=11072 # -> now in images.conf
24	# standard kernel opts	# standard kernel opts
25	KERNELOPTS="quiet video=1024x768"	DEFAULT_KERNELOPTS="quiet video=1024x768"
26
27	# grub options	# grub options
28	GRUBLEGACYOPTS=""	DEFAULT_GRUBLEGACYOPTS=""
29	GRUB2OPTS=""	DEFAULT_GRUB2OPTS=""
30		DEFAULT_GRUB2GFXPAYLOAD="1024x768x16,1024x768"
	# fdisk options
	FDISKPARTIONBELOW256MB=0
31
32	# default specialdevices	# default specialdevices
33	SPECIALDEVICE=""	DEFAULT_FORMFACTOR="desktop"
	FORMFACTOR="desktop"
34
35	# target filesystem	# target filesystem
36	FORMAT_FILESYSTEM="ext4"	DEFAULT_FORMAT_FILESYSTEM="ext4"
37
38		# initialize global variables so they are exportable
39		INSTALL_METHOD=""
40		KERNELOPTS=""
41		GRUBLEGACYOPTS=""
42		GRUB2OPTS=""
43		GRUB2GFXPAYLOAD=""
44		FORMFACTOR=""
45		FORMAT_FILESYSTEM=""
46		FDISKPARTIONBELOW256MB=0
47		SPECIALDEVICE=""
48		### linecount of system.tar.gz -1 !
49		CURRENTLINE=0
50		#TOTALLINES=11072 # -> now in images.conf
51
52	#################################################	#################################################
53	#  DIALOG BOXEN #	#  DIALOG BOXES #
54	#################################################	#################################################
55
56	die()	die()
#	Line 80  dialog_warning()	Line 81  dialog_warning()
81
82	dialog_setup_hdd_info()	dialog_setup_hdd_info()
83	{	{
84		case "${INSTALL_METHOD}" in
85		auto)
86		dialog_setup_hdd_info_auto
87		dialog_setup_hdd_create_partitions
88		;;
89		normal) dialog_setup_hdd_info_normal ;;
90		single) dialog_setup_hdd_info_single ;;
91		esac
92		}
93
94		dialog_setup_hdd_info_normal()
95		{
96	local SHDD="$(echo ${HDD} | sed 's/\/dev\///')"	local SHDD="$(echo ${HDD} | sed 's/\/dev\///')"
97
98	dialog \	dialog \
#	Line 94  dialog_setup_hdd_info()	Line 107  dialog_setup_hdd_info()
107	Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81	Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
108	}	}
109
110	dialog_setup_hdd_info_flash()	dialog_setup_hdd_info_single()
111	{	{
112	local SHDD="$(echo $HDD | sed 's/\/dev\///')"	local SHDD="$(echo $HDD | sed 's/\/dev\///')"
113
#	Line 137  dialog_setup_system_menu()	Line 150  dialog_setup_system_menu()
150	"" "" \	"" "" \
151	"" "\Z1Experten Modi:\Zn" \	"" "\Z1Experten Modi:\Zn" \
152	"2" "Normale IDE-Disk (Manuell)" \	"2" "Normale IDE-Disk (Manuell)" \
153	"3" "Flash-Speicher (Manuell)")	"3" "Normale IDE Disk (Single)")
154	RES=$?	RES=$?
155	[[ ${RES} -eq 1 ]] && return 1	[[ ${RES} -eq 1 ]] && return 1
156	if [[ ${RES} -eq 0 ]]	if [[ ${RES} -eq 0 ]]
157	then	then
158	case "${i}" in	case "${i}" in
159	"1") run_install_auto ;;	"1") run_install auto ;;
160	"2") run_install_normal ;;	"2") run_install normal ;;
161	"3") run_install_flash ;;	"3") run_install single ;;
162	"") dialog_setup_system_menu;;	"") dialog_setup_system_menu;;
163	esac	esac
164	fi	fi
#	Line 163  dialog_hardware_detection()	Line 176  dialog_hardware_detection()
176	hwtmp="/tmp/hwtmp.sh"	hwtmp="/tmp/hwtmp.sh"
177	fi	fi
178
179	[[ ! -z ${installdevs} ]] && installdevs=""	run_hardware_detection_disks
180
181	echo "dialog \\"  > ${hwtmp}	echo "dialog \\"  > ${hwtmp}
182	echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}	echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}
#	Line 173  dialog_hardware_detection()	Line 186  dialog_hardware_detection()
186	echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}	echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}
187	echo " Festplatten:\n \\" >> ${hwtmp}	echo " Festplatten:\n \\" >> ${hwtmp}
188
189	if [[ ! -z ${scsidisks} ]]	if [[ ! -z ${ALL_DISKS} ]]
190	then	then
191	for i in ${scsidisks}	for i in ${ALL_DISKS}
192	do	do
193	if [[ ${i} != ${cdromdev} ]]	echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp}
	then
	echo " \\Z7SCSI: \\Z3${i}\\Zn\n \\" >> ${hwtmp}
	installdevs="${installdevs} ${i}"
	fi
194	done	done
195	fi	fi
196
197	if [[ ! -z ${idedisks} ]]	if [[ ! -z ${ALL_CDROMS} ]]
198	then	then
199	for i in ${idedisks}	echo " \n \\" >> ${hwtmp}
200		echo " CDROM Laufwerke:\n \\" >> ${hwtmp}
201		for i in ${ALL_CDROMS}
202	do	do
203	if [[ ${i} != ${cdromdev} ]]	echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp}
	then
	echo " \\Z7IDE:  \\Z3${i}\\Zn\n \\" >> ${hwtmp}
	installdevs="${installdevs} ${i}"
	fi
204	done	done
205	fi	fi
206
	if [[ ! -z ${cdromdev} ]]
	then
	echo " \n \\" >> ${hwtmp}
	echo " \\Z7andere Laufwerke:\n \\" >> ${hwtmp}
	echo " CDROM: \\Z3${cdromdev}\\Zn\n \\" >> ${hwtmp}
	fi
207	# other devices	# other devices
208	run_hardware_detection	run_hardware_detection
209	case "${SPECIALDEVICE}" in	case "${SPECIALDEVICE}" in
210	zotac*) echo " \n\n\n \\Z2Zotac Device erkannt!\\Zn \\" >> ${hwtmp} ;;	zotac*) echo " \n \\Z2Zotac Device erkannt.\\Zn \\" >> ${hwtmp} ;;
211	rangee) echo " \n\n\n \\Z2Rangee Device erkannt!\\Zn \\" >> ${hwtmp} ;;	rangee) echo " \n \\Z2Rangee Device erkannt.\\Zn \\" >> ${hwtmp} ;;
212	maxdata) echo " \n\n\n \\Z2Maxdata Device erkannt!\\Zn \\" >> ${hwtmp} ;;	maxdata) echo " \n \\Z2Maxdata Device erkannt.\\Zn \\" >> ${hwtmp} ;;
213	*) echo " \n\n\n \\ZnStandard Device erkannt!\\Zn \\" >> ${hwtmp} ;;	i845) echo " \n \\Z2Intel i845 Device erkannt.\\Zn \\" >> ${hwtmp} ;;
214		*) echo " \n \\ZnStandard Device erkannt.\\Zn \\" >> ${hwtmp} ;;
215	esac	esac
216	if [[ ${FORMFACTOR} = laptop ]]	if [[ ${FORMFACTOR} = laptop ]]
217	then	then
218	echo " \n\n\n \\ZnFormfactor Laptop erkannt, Powersave Modus 'ondemand' wird aktiviert!\\Zn \\" >> ${hwtmp}	echo " \n \\ZnFormfactor Laptop, Powersave Modus 'ondemand' wird aktiviert.\\Zn \\" >> ${hwtmp}
219	fi	fi
220
221	echo " \" 13 70" >> ${hwtmp}	echo " \" 14 70" >> ${hwtmp}
222	chmod a+x ${hwtmp}	chmod a+x ${hwtmp}
223	${hwtmp}	${hwtmp}
224
#	Line 228  dialog_hardware_detection()	Line 229  dialog_hardware_detection()
229	fi	fi
230	}	}
231
232	dialog_setup_hdd_partitions_manuell()	dialog_setup_hdd_partitions()
233	{	{
234	local i	local i
235
236	if [[ -z ${installdevs} ]]	if [[ -z ${ALL_DISKS} ]]
237	then	then
238	dialog \	dialog \
239	--backtitle "${TITLE}" \	--backtitle "${TITLE}" \
#	Line 248  dialog_setup_hdd_partitions_manuell()	Line 249  dialog_setup_hdd_partitions_manuell()
249	echo "--stdout \\" >> /tmp/hddtmp.sh	echo "--stdout \\" >> /tmp/hddtmp.sh
250	echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh	echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
251
252	for i in ${installdevs}	for i in ${ALL_DISKS}
253	do	do
254	echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh	echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
255	done	done
#	Line 261  dialog_setup_hdd_partitions_manuell()	Line 262  dialog_setup_hdd_partitions_manuell()
262	if [[ ${RES} -eq 0 ]]	if [[ ${RES} -eq 0 ]]
263	then	then
264	dialog_setup_hdd_info	dialog_setup_hdd_info
265	setup_hdd_partitions_manuell	setup_hdd_partitions
	fi
	fi
	}
	dialog_setup_hdd_partitions_manuell_flash()
	{
	local i
	if [[ -z ${installdevs} ]]
	then
	dialog \
	--backtitle "${TITLE}" \
	--ok-label "Beenden" \
	--msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70
	exit 1
	else
	echo "dialog \\" > /tmp/hddtmp.sh
	echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh
	echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh
	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 ${installdevs}
	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 ]]
	then
	dialog_setup_hdd_info_flash
	setup_hdd_partitions_manuell_flash
	fi
	fi
	}
	dialog_setup_hdd_partitions_auto()
	{
	local i
	if [[ -z ${installdevs} ]]
	then
	dialog \
	--backtitle "${TITLE}" \
	--ok-label "Beenden" \
	--msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70
	exit 1
	else
	echo "dialog \\" > /tmp/hddtmp.sh
	echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh
	echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh
	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 ${installdevs}
	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 ]]
	then
	dialog_setup_hdd_info_auto
	dialog_setup_hdd_create_partitions
	setup_hdd_partitions_auto
266	fi	fi
267	fi	fi
268	}	}
#	Line 384  dialog_install_meter()	Line 308  dialog_install_meter()
308	return 0	return 0
309	}	}
310
311	dialog_install_bootsector()	dialog_install_bootsector()
312	{	{
313	dialog \	dialog \
#	Line 431  dialog_main()	Line 354  dialog_main()
354	if [[ ${RES} -eq 0 ]]	if [[ ${RES} -eq 0 ]]
355	then	then
356	case ${METHOD} in	case ${METHOD} in
357	"1") dialog_setup_system_menu ;;	"1") dialog_setup_system_menu ;;
358	"2") dialog_hardware_detection ;;	"2") dialog_hardware_detection ;;
359	"3") install_do_reboot ;;	"3") install_do_reboot ;;
360	"4") /bin/bash --login -i ;;	"4") /bin/bash --login -i ;;
#	Line 441  dialog_main()	Line 364  dialog_main()
364	}	}
365
366	#################################################	#################################################
367	# Install Komandos #	# Install Commands #
368	#################################################	#################################################
369	run_hardware_detection()	run_hardware_detection()
370	{	{
371	local hwinfo	local hwinfo
372	hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"	hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"
373
374	# check for special devices/clients:	# check for special devices/clients:
#	Line 464  run_hardware_detection()	Line 386  run_hardware_detection()
386
387	# 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
388	export GRUBLEGACYOPTS="rootdelay=8"	export GRUBLEGACYOPTS="rootdelay=8"
389	# there are to zotac types in the wild, nvidia based gfx and intel	# there are two zotac types in the wild, nvidia based gfx and intel
390	if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]	if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]
391	then	then
392	export SPECIALDEVICE="zotac_nvidia"	export SPECIALDEVICE="zotac_nvidia"
#	Line 491  run_hardware_detection()	Line 413  run_hardware_detection()
413	export GRUBLEGACYOPTS=""	export GRUBLEGACYOPTS=""
414	fi	fi
415
416		# check for i845 Chipsets and disable KMS and use 915 drm driver
417		if [[ ! -z $(echo "${hwinfo}" | grep -i i845) ]]
418		then
419		export SPECIALDEVICE="i845"
420		# unset default video=1024x768 opt or the drm driver breaks
421		export KERNELOPTS="quiet"
422		export GRUBLEGACYOPTS=""
423		# enable full kms support
424		export GRUB2GFXPAYLOAD="keep"
425		fi
426
427		# check for radeon gfxcards
428		if [[ ! -z $(echo "${hwinfo}" | grep -i radeon) ]]
429		then
430		# enable full kms support
431		export GRUB2GFXPAYLOAD="keep"
432		fi
433
434	# check for special devices/clients:	# check for special devices/clients:
435	# check for laptops and activate cpufreq scaling	# check for laptops and activate cpufreq scaling
436	if [[ $(echo "${hwinfo}" | grep 'Formfactor:' | sed 's:.*Formfactor\:\ \"\(.*\)\":\1:') = laptop ]]	if [[ $(echo "${hwinfo}" | grep 'Formfactor:' | sed 's:.*Formfactor\:\ \"\(.*\)\":\1:') = laptop ]]
#	Line 500  run_hardware_detection()	Line 440  run_hardware_detection()
440	fi	fi
441	}	}
442
443		run_hardware_detection_disks()
444		{
445		local bootdev
446
447		# all disks but exclude ramdisks
448		export ALL_DISKS=$(get_hwinfo disk | sed '/\/dev\/ram[0-9].*/d')
449		# remove the boot device from ALL_DISKS if it was an usbstick
450		if [[ $(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f3) != iso9660 ]]
451		then
452		bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')"
453		export ALL_DISKS=$(echo "${ALL_DISKS}" | grep -v "${bootdev}")
454		fi
455		export ALL_CDROMS="$(get_hwinfo cdrom)"
456		}
457
458	hdd_size_below_256mb()	hdd_size_below_256mb()
459	{	{
460	local hdd="$1"	local hdd="$1"
#	Line 518  hdd_size_below_256mb()	Line 473  hdd_size_below_256mb()
473	return "${retval}"	return "${retval}"
474	}	}
475
476	setup_hdd_partitions_auto()	setup_hdd_partitions()
477	{	{
478	ROOTHDD="${HDD}1"	case "${INSTALL_METHOD}" in
479		normal)
480		BOOTHDD="${HDD}1"
481		SWAPHDD="${HDD}2"
482		ROOTHDD="${HDD}3"
483		;;
484
485		single|auto)
486		BOOTHDD=""
487		SWAPHDD=""
488		ROOTHDD="${HDD}1"
489		;;
490		esac
491
492	# run this only if FDISKPARTITIONBELOW256MB is not already 1	if [[ ${INSTALL_METHOD} = auto ]]
	if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
493	then	then
494	if hdd_size_below_256mb ${HDD}	# run this only if FDISKPARTITIONBELOW256MB is not already 1
495		if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
496	then	then
497	FDISKPARTIONBELOW256MB=1	if hdd_size_below_256mb ${HDD}
498	else	then
499	FDISKPARTIONBELOW256MB=0	FDISKPARTIONBELOW256MB=1
500		else
501		FDISKPARTIONBELOW256MB=0
502		fi
503	fi	fi
	fi
504
505	## delete disk	## delete disk
506	dd if=/dev/zero of=${HDD} count=1 &> /dev/null || die	dd if=/dev/zero of=${HDD} count=1 &> /dev/null || die
507
508	if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]	if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]
509	then	then
510	## setup one bootable partition	## setup one bootable partition
511	#1. n= new disk	#1. n= new disk
512	#2. p= primary disk	#2. p= primary disk
513	#3. 1= first partition	#3. 1= first partition
514	#4. 2= default sector start // small disk needs more space for grub2 mbr sector	#4. 2= default sector start // small disk needs more space for grub2 mbr sector
515	#5. ''= defaul sector end	#5. ''= defaul sector end
516	#6. a= bootable flag	#6. a= bootable flag
517	#7. 1= boot flag for partition 1	#7. 1= boot flag for partition 1
518	#8. w= write/quit	#8. w= write/quit
519	fdisk ${HDD} &> /dev/null << EOF	fdisk ${HDD} &> /dev/null << EOF
520	n	n
521	p	p
522	1	1
#	Line 557  a	Line 526  a
526	1	1
527	w	w
528	EOF	EOF
529	else	else
530	## setup one bootable partition	## setup one bootable partition
531	#1. n= new disk	#1. n= new disk
532	#2. p= primary disk	#2. p= primary disk
533	#3. 1= first partition	#3. 1= first partition
534	#4. ''= default sector start	#4. ''= default sector start
535	#5. ''= defaul sector end	#5. ''= defaul sector end
536	#6. a= bootable flag	#6. a= bootable flag
537	#7. 1= boot flag for partition 1	#7. 1= boot flag for partition 1
538	#8. w= write/quit	#8. w= write/quit
539	fdisk ${HDD} &> /dev/null << EOF	fdisk ${HDD} &> /dev/null << EOF
540	n	n
541	p	p
542	1	1
#	Line 577  a	Line 546  a
546	1	1
547	w	w
548	EOF	EOF
549		fi
550		else
551		## hdds partitionieren manuell
552		cfdisk ${HDD} || die
553	fi	fi
554	}	}
555
	setup_hdd_partitions_manuell()
	{
	BOOTHDD="${HDD}1"
	SWAPHDD="${HDD}2"
	ROOTHDD="${HDD}3"
	## hdds partitionieren manuell
	cfdisk ${HDD} || die
	}
	setup_hdd_partitions_manuell_flash()
	{
	ROOTHDD="${HDD}1"
	## hdds partitionieren manuell
	cfdisk ${HDD} || die
	}
556	setup_hdd_format()	setup_hdd_format()
557	{	{
558	mkswap ${SWAPHDD} || die	if [[ -n ${SWAPHDD} ]]
559	mke2fs -j -q ${BOOTHDD} || die	then
560	mke2fs -j -q ${ROOTHDD} || die	mkswap ${SWAPHDD} || die
561	}	fi
562		if [[ -n ${BOOTHDD} ]]
563	setup_hdd_format_flash()	then
564	{	mke2fs -j -q ${BOOTHDD} || die
565	mke2fs -j -q ${ROOTHDD} || die	fi
566		if [[ -n ${ROOTHDD} ]]
567		then
568		mke2fs -j -q ${ROOTHDD} || die
569		fi
570	}	}
571
572	install_mount_rootfs()	install_mount_rootfs()
573	{	{
574	swapon ${SWAPHDD} || die	if [[ -n ${SWAPHDD} ]]
575	mount ${ROOTHDD} ${INSTALLPATH} || die	then
576	install -d ${INSTALLPATH}/boot || die	swapon ${SWAPHDD} || die
577	mount ${BOOTHDD} ${INSTALLPATH}/boot || die	fi
578	cd ${INSTALLPATH} || die	if [[ -n ${ROOTHDD} ]]
579	}	then
580		mount ${ROOTHDD} ${INSTALLPATH} || die
581		fi
582		if [[ -n ${BOOTHDD} ]]
583		then
584		install -d ${INSTALLPATH}/boot || die
585		mount ${BOOTHDD} ${INSTALLPATH}/boot || die
586		fi
587
	install_mount_rootfs_flash()
	{
	mount ${ROOTHDD} ${INSTALLPATH} || die
	install -d ${INSTALLPATH}/boot || die
588	cd ${INSTALLPATH} || die	cd ${INSTALLPATH} || die
589	}	}
590
#	Line 650  install_bootsector_chroot()	Line 612  install_bootsector_chroot()
612	if [[ -f ${INSTALLPATH}/etc/conf.d/grub ]]	if [[ -f ${INSTALLPATH}/etc/conf.d/grub ]]
613	then	then
614	sed -i "s:^\(export GRUB_CMDLINE_LINUX_DEFAULT=\).*:\1\"${KERNELOPTS}\":" ${INSTALLPATH}/etc/conf.d/grub || die	sed -i "s:^\(export GRUB_CMDLINE_LINUX_DEFAULT=\).*:\1\"${KERNELOPTS}\":" ${INSTALLPATH}/etc/conf.d/grub || die
615		sed -i "s:^\(export GRUB_GFXPAYLOAD_LINUX=\).*:\1\"${GRUB2GFXPAYLOAD}\":" ${INSTALLPATH}/etc/conf.d/grub || die
616	else	else
617	echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLPATH}/etc/conf.d/grub || die	echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLPATH}/etc/conf.d/grub || die
618		echo "export GRUB_GFXPAYLOAD_LINUX=\"${GRUB2GFXPAYLOAD}\"" >>  ${INSTALLPATH}/etc/conf.d/grub || die
619	fi	fi
620	echo 'grub-mkdevicemap' > ${INSTALLPATH}/root/.installrc || die	echo 'grub-mkdevicemap' > ${INSTALLPATH}/root/.installrc || die
621	echo "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null" >> ${INSTALLPATH}/root/.installrc || die	echo "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null" >> ${INSTALLPATH}/root/.installrc || die
#	Line 721  install_bootsector_chroot()	Line 685  install_bootsector_chroot()
685	echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die	echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
686	fi	fi
687
688	# bootsector schreiben chrooted schreiben (lfs/magellan)	# write bootsector chrooted (lfs/magellan)
689	cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF	cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF
690	/usr/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null	/usr/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null
691	root (hd0,0)	root (hd0,0)
#	Line 762  install_initrd_chroot()	Line 726  install_initrd_chroot()
726	DRMMODS="i915 mga nouveau r128 radeon savage sis tdfx ttm via"	DRMMODS="i915 mga nouveau r128 radeon savage sis tdfx ttm via"
727	OTHERMODS=""	OTHERMODS=""
728	case ${SPECIALDEVICE} in	case ${SPECIALDEVICE} in
729	zotac_intel) FBMODS=""; DRMMODS="i915" ;;	zotac_intel|i845) FBMODS=""; DRMMODS="i915" ;;
730	zotac_nvidia) FBMODS=""; DRMMODS="nouveau" ;;	zotac_nvidia) FBMODS=""; DRMMODS="nouveau" ;;
731	rangee) FBMODS="" ;; ## fallback to vesafb, viafb does not run on all CLE266 boards	rangee) FBMODS="" ;; ## fallback to vesafb, viafb does not run on all CLE266 boards
732	# not working with kms enabled drivers -> segfaults	# not working with kms enabled drivers -> segfaults
#	Line 841  install_system_settings()	Line 805  install_system_settings()
805	# schreibe fstab	# schreibe fstab
806	if is_uuid_supported	if is_uuid_supported
807	then	then
808	echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die	if [[ -n ${BOOTHDD} ]]
809	echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die	then
810		echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
811		fi
812		if [[ -n ${ROOTHDD} ]]
813		then
814		echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
815		fi
816	else	else
817	echo -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die	if [[ -n ${BOOTHDD} ]]
818	echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die	then
819		echo -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
820		fi
821		if [[ -n ${ROOTHDD} ]]
822		then
823		echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
824		fi
825	fi	fi
826	# not needed busybox loads all with swapon -a, even if not mentioned in fstab	# not needed busybox loads all with swapon -a, even if not mentioned in fstab
827	#echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die	#echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die
#	Line 869  install_system_settings()	Line 845  install_system_settings()
845	fi	fi
846	}	}
847
	install_system_settings_flash()
	{
	# schreibe fstab
	if is_uuid_supported
	then
	echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die
	else
	echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die
	fi
	echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
	echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
	}
848	install_umount_rootfs()	install_umount_rootfs()
849	{	{
850	cd /	cd /
851	umount ${INSTALLPATH}/boot || die	if [[ -n ${BOOTHDD} ]]
852	umount ${INSTALLPATH} || die	then
853	swapoff ${SWAPHDD} || die	umount ${INSTALLPATH}/boot || die
854	}	fi
855		if [[ -n ${ROOTHDD} ]]
856	install_umount_rootfs_flash()	then
857	{	umount ${INSTALLPATH} || die
858	cd /	fi
859	umount ${INSTALLPATH} || die	if [[ -n ${SWAPHDD} ]]
860		then
861		swapoff ${SWAPHDD} || die
862		fi
863	}	}
864
865	install_do_reboot()	install_do_reboot()
#	Line 902  install_do_reboot()	Line 868  install_do_reboot()
868	}	}
869
870	#################################################	#################################################
871	#     Install Ablauf Scripte #	#     Install Main Scripts #
872	#################################################	#################################################
873
874	run_install_normal()	run_install()
875	{	{
876		local method="$1"
877
878		# setup install environment
879		export KERNELOPTS="${DEFAULT_KERNELOPTS}"
880		export GRUBLEGACYOPTS="${GRUBLEGACYOPTS}"
881		export GRUB2OPTS="${GRUB2OPTS}"
882		export GRUB2GFXPAYLOAD="${DEFAULT_GRUB2GFXPAYLOAD}"
883		export FORMFACTOR="${DEFAULT_FORMFACTOR}"
884		export FORMAT_FILESYSTEM="${DEFAULT_FORMAT_FILESYSTEM}"
885
886		case "${method}" in
887		auto)
888		export INSTALL_METHOD="${method}"
889		;;
890		normal)
891		export INSTALL_METHOD="${method}"
892		;;
893		single)
894		export INSTALL_METHOD="${method}"
895		;;
896		*)
897		echo "Unknown install method '${method}', aborting."
898		exit 1
899		;;
900		esac
901
902	dialog_hardware_detection	dialog_hardware_detection
903
904	dialog_setup_hdd_partitions_manuell	dialog_setup_hdd_partitions
905	dialog_setup_hdd_format	dialog_setup_hdd_format
906	setup_hdd_format > /dev/null	setup_hdd_format > /dev/null
907	install_mount_rootfs	install_mount_rootfs
#	Line 927  run_install_normal()	Line 919  run_install_normal()
919	dialog_install_successful	dialog_install_successful
920	}	}
921
	run_install_flash()
	{
	dialog_hardware_detection
	dialog_setup_hdd_partitions_manuell_flash
	dialog_setup_hdd_format
	setup_hdd_format_flash > /dev/null
	install_mount_rootfs_flash
	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
	dialog_install_settings
	sleep 1
	install_system_settings_flash
	install_initrd_chroot
	dialog_install_bootsector
	install_bootsector_chroot
	install_umount_rootfs_flash
	dialog_install_successful
	}
	run_install_auto()
	{
	dialog_hardware_detection
	dialog_setup_hdd_partitions_auto
	dialog_setup_hdd_format
	setup_hdd_format_flash > /dev/null
	install_mount_rootfs_flash
	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
	dialog_install_settings
	sleep 1
	install_system_settings_flash
	install_initrd_chroot
	dialog_install_bootsector
	install_bootsector_chroot
	install_umount_rootfs_flash
	dialog_install_successful
	}
922	dialog_main	dialog_main
923
924	exit 0	exit 0

---

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

Legend: Removed from v.5004   changed lines   Added in v.6827