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

Parent Directory | Revision Log | Patch

	revision 2404 by niro, Tue Jan 7 13:20:20 2014 UTC	revision 2422 by niro, Tue Jan 7 13:54:06 2014 UTC
#	Line 72  FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}	Line 72  FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}
72	#  DIALOG BOXEN #	#  DIALOG BOXEN #
73	#################################################	#################################################
74
75		trap_exit()
76		{
77		is_mounted --location "${INSTALLROOT}/dev" && umount ${INSTALLROOT}/dev
78		is_mounted --location "${INSTALLROOT}/proc" && umount ${INSTALLROOT}/proc
79		is_mounted --location "${INSTALLROOT}/sys" && umount ${INSTALLROOT}/sys
80		is_mounted --location "${INSTALLROOT}/boot" && umount ${INSTALLROOT}/boot
81		is_mounted --location "${INSTALLROOT}" && umount ${INSTALLROOT}
82
83		echo $"Installation aborted."
84		exit 1
85		}
86
87	dialog_die()	dialog_die()
88	{	{
89	ERROR="$1"	ERROR="$1"
#	Line 96  dialog_warning()	Line 108  dialog_warning()
108
109	dialog_setup_hdd_info()	dialog_setup_hdd_info()
110	{	{
111	local SHDD="$(echo $HDD | sed 's/\/dev\///')"	local SHDD="${HDD//\/dev\/}"
112
113	dialog \	messagebox -h $"[ Harddrive partitioning ]" \
114	--colors \	$"\nPlease create 1 partition.\n\n\[ \Z3${SHDD}1\Zn ] type: \Z3linux\Zn with the whole diskspace\n\Please mark ${SHDD}1 \Z3bootable\Zn."
	--title "[ Festplatten Partitionierung ]" \
	--backtitle "${TITLE}" \
	--ok-label "Weiter" \
	--msgbox "\nBitte legen Sie 1 Partition an.\n\n\
	[ \Z3${SHDD}1\Zn ] Typ: \Z3Linux\Zn mit dem gesamten Speicher\n\
	Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
115	}	}
116
117	dialog_setup_hdd_info_auto()	dialog_setup_hdd_info_auto()
118	{	{
119	local SHDD="$(echo $HDD | sed 's/\/dev\///')"	local SHDD="${HDD//\/dev\/}"
120
121	dialog \	messagebox -h $"[ Harddrive partitioning ]" \
122	--colors \	$"\Z1Warning!\Zn\n\nAll data on disk [ \Z3${HDD}\Zn ] will be erased!"
	--title "[ Festplatten Partitionierung ]" \
	--backtitle "${TITLE}" \
	--ok-label "Weiter" \
	--msgbox "\nAchtung!\n\
	Alle Daten werden von der Disk [ \Z3${HDD}\Zn ] gelöscht!" 12 81
123	}	}
124
125	dialog_setup_system_menu()	dialog_setup_system_menu()
126	{	{
127	local i	local mode
128		local retval
129
130	i=$(dialog \	mode=$(menubox -h $"[ Harddrive partitioning ]" $"\nSelect an installation mode" \
131	--backtitle "${TITLE}" \	$"1:Automatic setup (recommended)" \
132	--title "[ Festplatten Partitionierung ]" \	":" \
133	--cancel-label "Abbrechen" \	$":\Z1Expert modes:\Zn" \
134	--ok-label "Weiter" \	$"2:Common IDE-disk (manual setup)")
135	--stdout \	retval=$?
136	--colors \	[[ ${retval} -eq 1 ]] && return 1
137	--menu "\nWaehlen Sie die Installations-Methode" 14 70 5 \	if [[ ${retval} -eq 0 ]]
	"1" "Automatisches Setup (Empfohlen)" \
	"" "" \
	"" "\Z1Experten Modi:\Zn" \
	"2" "Normale IDE-Disk (Manuell)" \
	RES=$?
	[[ ${RES} -eq 1 ]] && return 1
	if [[ ${RES} -eq 0 ]]
138	then	then
139	case "${i}" in	case "${mode}" in
140	"1") run_install_auto ;;	"1") run_install_auto ;;
141	"2") run_install_normal ;;	"2") run_install_normal ;;
142	"") dialog_setup_system_menu;;	"") dialog_setup_system_menu;;
#	Line 151  dialog_setup_system_menu()	Line 146  dialog_setup_system_menu()
146
147	dialog_hardware_detection()	dialog_hardware_detection()
148	{	{
149	local i	local message
	local hwtmp
	if [ -x $(type -P mktemp) ]
	then
	hwtmp="$(mktemp)"
	else
	hwtmp="/tmp/hwtmp.sh"
	fi
150
151	run_hardware_detection_disks	run_hardware_detection_disks
152
153	echo "dialog \\"  > ${hwtmp}	message+=$"Harddrives:\n"
	echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}
	echo "--ok-label \"Weiter\" \\" >> ${hwtmp}
	echo "--stdout \\" >> ${hwtmp}
	echo "--colors \\" >> ${hwtmp}
	echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}
	echo " Festplatten:\n \\" >> ${hwtmp}
154
155	if [[ ! -z ${ALL_DISKS} ]]	if [[ ! -z ${ALL_DISKS} ]]
156	then	then
157	for i in ${ALL_DISKS}	for i in ${ALL_DISKS}
158	do	do
159	echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp}	message+="\Z3${i}\Zn "
160	done	done
161		message+="\n"
162	fi	fi
163
164	if [[ ! -z ${ALL_CDROMS} ]]	if [[ ! -z ${ALL_CDROMS} ]]
165	then	then
166	echo " \n \\" >> ${hwtmp}	message+="\n"
167	echo " CDROM Laufwerke:\n \\" >> ${hwtmp}	message+=$"Optical disk drives:\n"
168	for i in ${ALL_CDROMS}	for i in ${ALL_CDROMS}
169	do	do
170	echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp}	message+="\Z3${i}\Zn"
171	done	done
172		message+="\n"
173	fi	fi
174
175	# other devices	# other devices
176	run_hardware_detection	run_hardware_detection
177	case "${SPECIALDEVICE}" in	case "${SPECIALDEVICE}" in
178	zotac*) echo " \n\n\n \\Z2Zotac Device erkannt.\\Zn \\" >> ${hwtmp} ;;	zotac*) message+=$"\n\Z2Zotac device detected.\Zn" ;;
179	rangee) echo " \n\n\n \\Z2Rangee Device erkannt.\\Zn \\" >> ${hwtmp} ;;	rangee) message+=$"\n\Z2Rangee device detected.\Zn" ;;
180	maxdata) echo " \n\n\n \\Z2Maxdata Device erkannt.\\Zn \\" >> ${hwtmp} ;;	maxdata) message+=$"\n\Z2Maxdata device detected.\Zn" ;;
181	*) echo " \n\n\n \\ZnStandard Device erkannt.\\Zn \\" >> ${hwtmp} ;;	*) message+=$"\n \\ZnCommon device detected.\Zn" ;;
182	esac	esac
183	if [[ ${FORMFACTOR} = laptop ]]	if [[ ${FORMFACTOR} = laptop ]]
184	then	then
185	echo " \n \\ZnFormfactor Laptop, Powersave Modus 'ondemand' wird aktiviert.\\Zn \\" >> ${hwtmp}	message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving  mode.\Zn"
186	fi	fi
187
188	echo " \" 14 70" >> ${hwtmp}	messagebox -y 15 -h $"Detected hardware:" "${message}"
	chmod a+x ${hwtmp}
	${hwtmp}
	# remove tmp file
	if [[ -f ${hwtmp} ]]
	then
	rm ${hwtmp}
	fi
189	}	}
190
191	dialog_setup_hdd_partitions_manuell()	dialog_setup_hdd_partitions_manual()
192	{	{
193	local i	local i
194		local retval
195
196	if [[ -z ${installdevs} ]]	if [[ -z ${ALL_DISKS} ]]
197	then	then
198	dialog \	dialog_no_harddrive_found
	--backtitle "${TITLE}" \
	--ok-label "Beenden" \
	--msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70
199	exit 1	exit 1
200	else	else
201		HDD=$(dialog_select_target_harddrive)
202	echo "dialog \\" > /tmp/hddtmp.sh	retval=$?
203	echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh	[[ ${retval} -eq 1 ]] && return 1
204	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 ${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 ]]
205	then	then
206	dialog_setup_hdd_info	dialog_setup_hdd_info
207	setup_hdd_partitions_manuell	setup_hdd_partitions_manual
208	fi	fi
209	fi	fi
210	}	}
#	Line 254  dialog_setup_hdd_partitions_manuell()	Line 212  dialog_setup_hdd_partitions_manuell()
212	dialog_setup_hdd_partitions_auto()	dialog_setup_hdd_partitions_auto()
213	{	{
214	local i	local i
215		local retval
216
217	if [[ -z ${installdevs} ]]	if [[ -z ${ALL_DISKS} ]]
218	then	then
219	dialog \	dialog_no_harddrive_found
	--backtitle "${TITLE}" \
	--ok-label "Beenden" \
	--msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70
220	exit 1	exit 1
221	else	else
222		HDD=$(dialog_select_target_harddrive)
223	echo "dialog \\" > /tmp/hddtmp.sh	retval=$?
224	echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh	[[ ${retval} -eq 1 ]] && return 1
225	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 ${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 ]]
226	then	then
227	dialog_setup_hdd_info_auto	dialog_setup_hdd_info_auto
228	dialog_setup_hdd_create_partitions	dialog_setup_hdd_create_partitions
#	Line 542  EOF	Line 483  EOF
483	fi	fi
484	}	}
485
486	setup_hdd_partitions_manuell()	setup_hdd_partitions_manual()
487	{	{
488	ROOTHDD="${HDD}1"	ROOTHDD="${HDD}1"
489
490	## hdds partitionieren manuell	## hdds partitionieren manual
491	cfdisk ${HDD} || dialog_die	cfdisk ${HDD} || dialog_die
492	}	}
493
#	Line 823  run_install_normal()	Line 764  run_install_normal()
764	{	{
765	dialog_hardware_detection	dialog_hardware_detection
766
767	dialog_setup_hdd_partitions_manuell	dialog_setup_hdd_partitions_manual
768	dialog_setup_hdd_format	dialog_setup_hdd_format
769	setup_hdd_format > /dev/null	setup_hdd_format > /dev/null
770	install_mount_rootfs	install_mount_rootfs
#	Line 863  run_install_auto()	Line 804  run_install_auto()
804	dialog_install_successful	dialog_install_successful
805	}	}
806
807		# set some proper traps
808		trap "trap_exit" SIGINT SIGQUIT
809
810	dialog_main	dialog_main
811
812	exit 0	exit 0

---

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

Legend: Removed from v.2404   changed lines   Added in v.2422