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

Parent Directory | Revision Log | Patch

	revision 2342 by niro, Fri Jan 3 14:57:23 2014 UTC	revision 2403 by niro, Tue Jan 7 13:18:21 2014 UTC
#	Line 16  INSTALLER_LIBDIR="%LIBDIR%"	Line 16  INSTALLER_LIBDIR="%LIBDIR%"
16	# -> now in images.conf	# -> now in images.conf
17	CURRENTLINE=0	CURRENTLINE=0
18
19	# configuration	die()
20	if [ -e %SYSCONFDIR%/installer.conf ]	{
21	then	echo "Error: $@"
22	source %SYSCONFDIR%/installer.conf	exit 1
23	else	}
24	die "/etc/installer.conf not found"
25	fi	# load common includes
26		for inc in %SYSCONFDIR%/installer.conf \
27		${INSTALLER_LIBDIR}/functions/common.sh \
28		${INSTALLER_LIBDIR}/functions/common-dialogs.sh \
29		${INSTALLER_LIBDIR}/functions/hwdetection.sh \
30		${INSTALLER_LIBDIR}/functions/installer-dialogs.sh
31		do
32		if [ -e ${inc} ]
33		then
34		source "${inc}"
35		else
36		die "'${inc}' not found"
37		fi
38		done
39
40	# TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !	# TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !
41	# -> now in images.conf	# -> now in images.conf
#	Line 39  else	Line 52  else
52	die "/mnt/cdrom/system/images.conf not found"	die "/mnt/cdrom/system/images.conf not found"
53	fi	fi
54
	# includes
	source ${INSTALLER_LIBDIR}/functions/hwdetection.sh
55	### System/Config Version	### System/Config Version
56	VERSION="%VERSIONTAG%"	VERSION="%VERSIONTAG%"
57	TITLE="${DEFAULT_TITLE} - ${VERSION}"	TITLE="${DEFAULT_TITLE} - ${VERSION}"
58
59	CDPATH="${DEFAULT_CDPATH}"	CDROOT="${DEFAULT_CDROOT}"
60	INSTALLROOT="${DEFAULT_INSTALLROOT}"	INSTALLROOT="${DEFAULT_INSTALLROOT}"
61
62	# standard kernel opts	# standard kernel opts
#	Line 70  FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}	Line 80  FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}
80	#  DIALOG BOXEN #	#  DIALOG BOXEN #
81	#################################################	#################################################
82
	die()
	{
	echo "Error: $@"
	exit 1
	}
83	dialog_die()	dialog_die()
84	{	{
85	ERROR="$1"	ERROR="$1"
#	Line 86  dialog_die()	Line 90  dialog_die()
90
91	dialog_warning()	dialog_warning()
92	{	{
93	dialog \	local retval
94	--backtitle "${TITLE}" \
95	--colors \	yesnobox $"\Z1 !!! Warning !!! \Zn\n\n\This harddrive will be irreversibly erased.\n\n\Do you want to continue ?"
96	--defaultno \	retval=$?
97	--yesno "\Z1 !!! Achtung !!! \Zn\n\n\	if [[ ${retval} -eq 1 ]]
	Diese Festplatte wird unwiederruflich geloescht werden.\n\n\
	Soll ich wirklich fortfahren ?" 10 70
	RES=$?
	if [[ ${RES} -eq 1 ]]
98	then	then
99	clear	clear
100	echo "Der Vorgang wurde abgebrochen."	echo $"The process was aborted."
101	exit 1	exit 1
102	fi	fi
103	}	}
104
105	dialog_setup_hdd_info()	dialog_setup_hdd_info()
106	{	{
	local SHDD="$(echo ${HDD} | sed 's/\/dev\///')"
	dialog \
	--colors \
	--title "[ Festplatten Partitionierung ]" \
	--backtitle "${TITLE}" \
	--ok-label "Weiter" \
	--msgbox "\nBitte legen Sie 3 Partitionen an.\n\n\
	[ \Z3${SHDD}1\Zn ] Typ: \Z3Linux\Zn mit ca. 50MB\n\
	[ \Z3${SHDD}2\Zn ] Typ: \Z3Linux Swap\Zn mit ca. 256MB\n\
	[ \Z3${SHDD}3\Zn ] Typ: \Z3Linux \Zn mit dem Rest (min. 256MB)\n\n\
	Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
	}
	dialog_setup_hdd_info_flash()
	{
107	local SHDD="$(echo $HDD | sed 's/\/dev\///')"	local SHDD="$(echo $HDD | sed 's/\/dev\///')"
108
109	dialog \	dialog \
#	Line 161  dialog_setup_system_menu()	Line 145  dialog_setup_system_menu()
145	"" "" \	"" "" \
146	"" "\Z1Experten Modi:\Zn" \	"" "\Z1Experten Modi:\Zn" \
147	"2" "Normale IDE-Disk (Manuell)" \	"2" "Normale IDE-Disk (Manuell)" \
	"3" "Flash-Speicher (Manuell)")
148	RES=$?	RES=$?
149	[[ ${RES} -eq 1 ]] && return 1	[[ ${RES} -eq 1 ]] && return 1
150	if [[ ${RES} -eq 0 ]]	if [[ ${RES} -eq 0 ]]
#	Line 169  dialog_setup_system_menu()	Line 152  dialog_setup_system_menu()
152	case "${i}" in	case "${i}" in
153	"1") run_install_auto ;;	"1") run_install_auto ;;
154	"2") run_install_normal ;;	"2") run_install_normal ;;
	"3") run_install_flash ;;
155	"") dialog_setup_system_menu;;	"") dialog_setup_system_menu;;
156	esac	esac
157	fi	fi
#	Line 180  dialog_hardware_detection()	Line 162  dialog_hardware_detection()
162	local i	local i
163	local hwtmp	local hwtmp
164
165	if [ -x $(which mktemp &> /dev/null) ]	if [ -x $(type -P mktemp) ]
166	then	then
167	hwtmp="$(mktemp)"	hwtmp="$(mktemp)"
168	else	else
169	hwtmp="/tmp/hwtmp.sh"	hwtmp="/tmp/hwtmp.sh"
170	fi	fi
171
172	[[ ! -z ${installdevs} ]] && installdevs=""	run_hardware_detection_disks
173
174	echo "dialog \\"  > ${hwtmp}	echo "dialog \\"  > ${hwtmp}
175	echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}	echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}
#	Line 197  dialog_hardware_detection()	Line 179  dialog_hardware_detection()
179	echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}	echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}
180	echo " Festplatten:\n \\" >> ${hwtmp}	echo " Festplatten:\n \\" >> ${hwtmp}
181
182	if [[ ! -z ${scsidisks} ]]	if [[ ! -z ${ALL_DISKS} ]]
183	then	then
184	for i in ${scsidisks}	for i in ${ALL_DISKS}
185	do	do
186	if [[ ${i} != ${cdromdev} ]]	echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp}
	then
	echo " \\Z7SCSI: \\Z3${i}\\Zn\n \\" >> ${hwtmp}
	installdevs="${installdevs} ${i}"
	fi
187	done	done
188	fi	fi
189
190	if [[ ! -z ${idedisks} ]]	if [[ ! -z ${ALL_CDROMS} ]]
191	then	then
192	for i in ${idedisks}	echo " \n \\" >> ${hwtmp}
193		echo " CDROM Laufwerke:\n \\" >> ${hwtmp}
194		for i in ${ALL_CDROMS}
195	do	do
196	if [[ ${i} != ${cdromdev} ]]	echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp}
	then
	echo " \\Z7IDE:  \\Z3${i}\\Zn\n \\" >> ${hwtmp}
	installdevs="${installdevs} ${i}"
	fi
197	done	done
198	fi	fi
199
	if [[ ! -z ${cdromdev} ]]
	then
	echo " \n \\" >> ${hwtmp}
	echo " \\Z7andere Laufwerke:\n \\" >> ${hwtmp}
	echo " CDROM: \\Z3${cdromdev}\\Zn\n \\" >> ${hwtmp}
	fi
200	# other devices	# other devices
201	run_hardware_detection	run_hardware_detection
202	case "${SPECIALDEVICE}" in	case "${SPECIALDEVICE}" in
#	Line 290  dialog_setup_hdd_partitions_manuell()	Line 259  dialog_setup_hdd_partitions_manuell()
259	fi	fi
260	}	}
261
262	dialog_setup_hdd_partitions_manuell_flash()	dialog_setup_hdd_partitions_auto()
263	{	{
264	local i	local i
265
#	Line 322  dialog_setup_hdd_partitions_manuell_flas	Line 291  dialog_setup_hdd_partitions_manuell_flas
291	[[ ${RES} -eq 1 ]] && return 1	[[ ${RES} -eq 1 ]] && return 1
292	if [[ ${RES} -eq 0 ]]	if [[ ${RES} -eq 0 ]]
293	then	then
294	dialog_setup_hdd_info_flash	dialog_setup_hdd_info_auto
295	setup_hdd_partitions_manuell_flash	dialog_setup_hdd_create_partitions
296		setup_hdd_partitions_auto
297	fi	fi
298	fi	fi
299	}	}
300
301	dialog_setup_hdd_partitions_auto()	run_hardware_detection_disks()
302	{	{
303	local i	local bootdev
304
305	if [[ -z ${installdevs} ]]	# all disks but exclude ramdisks
306		export ALL_DISKS=$(get_hwinfo disk | sed '/\/dev\/ram[0-9].*/d')
307		# remove the boot device from ALL_DISKS if it was an usbstick
308		if [[ $(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f3) != iso9660 ]]
309	then	then
310	dialog \	bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')"
311	--backtitle "${TITLE}" \	export ALL_DISKS=$(echo "${ALL_DISKS}" | grep -v "${bootdev}")
	--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
	fi
312	fi	fi
313		export ALL_CDROMS="$(get_hwinfo cdrom)"
314	}	}
315
316	dialog_setup_hdd_create_partitions()	dialog_setup_hdd_create_partitions()
#	Line 606  EOF	Line 552  EOF
552
553	setup_hdd_partitions_manuell()	setup_hdd_partitions_manuell()
554	{	{
	BOOTHDD="${HDD}1"
	SWAPHDD="${HDD}2"
	ROOTHDD="${HDD}3"
	## hdds partitionieren manuell
	cfdisk ${HDD} || dialog_die
	}
	setup_hdd_partitions_manuell_flash()
	{
555	ROOTHDD="${HDD}1"	ROOTHDD="${HDD}1"
556
557	## hdds partitionieren manuell	## hdds partitionieren manuell
#	Line 624  setup_hdd_partitions_manuell_flash()	Line 560  setup_hdd_partitions_manuell_flash()
560
561	setup_hdd_format()	setup_hdd_format()
562	{	{
	mkswap ${SWAPHDD} || dialog_die
	mke2fs -j -q ${BOOTHDD} || dialog_die
	mke2fs -j -q ${ROOTHDD} || dialog_die
	}
	setup_hdd_format_flash()
	{
563	mke2fs -j -q ${ROOTHDD} || dialog_die	mke2fs -j -q ${ROOTHDD} || dialog_die
564	}	}
565
566	install_mount_rootfs()	install_mount_rootfs()
567	{	{
	swapon ${SWAPHDD} || dialog_die
	mount ${ROOTHDD} ${INSTALLROOT} || dialog_die
	install -d ${INSTALLROOT}/boot || dialog_die
	mount ${BOOTHDD} ${INSTALLROOT}/boot || dialog_die
	cd ${INSTALLROOT} || dialog_die
	}
	install_mount_rootfs_flash()
	{
568	mount ${ROOTHDD} ${INSTALLROOT} || dialog_die	mount ${ROOTHDD} ${INSTALLROOT} || dialog_die
569	install -d ${INSTALLROOT}/boot || dialog_die	install -d ${INSTALLROOT}/boot || dialog_die
570	cd ${INSTALLROOT} || dialog_die	cd ${INSTALLROOT} || dialog_die
#	Line 652  install_mount_rootfs_flash()	Line 572  install_mount_rootfs_flash()
572
573	install_system_image()	install_system_image()
574	{	{
575	tar xvjpf ${CDPATH}/system/${CDIMAGENAME} -C ${INSTALLROOT}	tar xvjpf ${CDROOT}/system/${CDIMAGENAME} -C ${INSTALLROOT}
576	}	}
577
578	install_bootsector_chroot()	install_bootsector_chroot()
#	Line 829  CHROOTEOF	Line 749  CHROOTEOF
749
750	is_uuid_supported()	is_uuid_supported()
751	{	{
752	if [[ -x $(which busybox.mkinitrd &> /dev/null) ]]	if [[ -x $(type -P busybox.mkinitrd) ]]
753	then	then
754	# only detect uuids if supported	# only detect uuids if supported
755	if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]	if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]
#	Line 865  install_system_settings()	Line 785  install_system_settings()
785	# schreibe fstab	# schreibe fstab
786	if is_uuid_supported	if is_uuid_supported
787	then	then
	echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLROOT}/etc/fstab || dialog_die
788	echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die	echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die
789	else	else
	echo -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLROOT}/etc/fstab || dialog_die
790	echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die	echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die
791	fi	fi
792	# 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
#	Line 893  install_system_settings()	Line 811  install_system_settings()
811	fi	fi
812	}	}
813
	install_system_settings_flash()
	{
	# schreibe fstab
	if is_uuid_supported
	then
	echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLROOT}/etc/fstab || dialog_die
	else
	echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLROOT}/etc/fstab || dialog_die
	fi
	echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die
	echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die
	}
814	install_umount_rootfs()	install_umount_rootfs()
815	{	{
816	cd /	cd /
817	umount ${INSTALLROOT}/boot || dialog_die	umount ${INSTALLROOT}/boot || dialog_die
818	umount ${INSTALLROOT} || dialog_die	umount ${INSTALLROOT} || dialog_die
	swapoff ${SWAPHDD} || dialog_die
	}
	install_umount_rootfs_flash()
	{
	cd /
	umount ${INSTALLROOT} || dialog_die
819	}	}
820
821	install_do_reboot()	install_do_reboot()
#	Line 951  run_install_normal()	Line 849  run_install_normal()
849	dialog_install_successful	dialog_install_successful
850	}	}
851
	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
	}
852	run_install_auto()	run_install_auto()
853	{	{
854	dialog_hardware_detection	dialog_hardware_detection
855
856	dialog_setup_hdd_partitions_auto	dialog_setup_hdd_partitions_auto
857	dialog_setup_hdd_format	dialog_setup_hdd_format
858	setup_hdd_format_flash > /dev/null	setup_hdd_format > /dev/null
859	install_mount_rootfs_flash	install_mount_rootfs
860	(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 | dialog_install_meter | dialog_install_system_image
861
862	dialog_install_settings	dialog_install_settings
863	sleep 1	sleep 1
864	install_system_settings_flash	install_system_settings
865	install_initrd_chroot	install_initrd_chroot
866
867	dialog_install_bootsector	dialog_install_bootsector
868	install_bootsector_chroot	install_bootsector_chroot
869
870	install_umount_rootfs_flash	install_umount_rootfs
871	dialog_install_successful	dialog_install_successful
872	}	}
873

---

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

Legend: Removed from v.2342   changed lines   Added in v.2403