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

Parent Directory | Revision Log | Patch

	revision 2343 by niro, Fri Jan 3 14:58:22 2014 UTC	revision 2401 by niro, Tue Jan 7 13:16:16 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		do
28		if [ -e ${inc} ]
29		then
30		source "${inc}"
31		else
32		die "'${inc}' not found"
33		fi
34		done
35
36	# TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !	# TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !
37	# -> now in images.conf	# -> now in images.conf
#	Line 70  FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}	Line 79  FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}
79	#  DIALOG BOXEN #	#  DIALOG BOXEN #
80	#################################################	#################################################
81
	die()
	{
	echo "Error: $@"
	exit 1
	}
82	dialog_die()	dialog_die()
83	{	{
84	ERROR="$1"	ERROR="$1"
#	Line 86  dialog_die()	Line 89  dialog_die()
89
90	dialog_warning()	dialog_warning()
91	{	{
92	dialog \	local retval
93	--backtitle "${TITLE}" \
94	--colors \	yesnobox $"\Z1 !!! Warning !!! \Zn\n\n\This harddrive will be irreversibly erased.\n\n\Do you want to continue ?"
95	--defaultno \	retval=$?
96	--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 ]]
97	then	then
98	clear	clear
99	echo "Der Vorgang wurde abgebrochen."	echo $"The process was aborted."
100	exit 1	exit 1
101	fi	fi
102	}	}
103
104	dialog_setup_hdd_info()	dialog_setup_hdd_info()
105	{	{
	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()
	{
106	local SHDD="$(echo $HDD | sed 's/\/dev\///')"	local SHDD="$(echo $HDD | sed 's/\/dev\///')"
107
108	dialog \	dialog \
#	Line 161  dialog_setup_system_menu()	Line 144  dialog_setup_system_menu()
144	"" "" \	"" "" \
145	"" "\Z1Experten Modi:\Zn" \	"" "\Z1Experten Modi:\Zn" \
146	"2" "Normale IDE-Disk (Manuell)" \	"2" "Normale IDE-Disk (Manuell)" \
	"3" "Flash-Speicher (Manuell)")
147	RES=$?	RES=$?
148	[[ ${RES} -eq 1 ]] && return 1	[[ ${RES} -eq 1 ]] && return 1
149	if [[ ${RES} -eq 0 ]]	if [[ ${RES} -eq 0 ]]
#	Line 169  dialog_setup_system_menu()	Line 151  dialog_setup_system_menu()
151	case "${i}" in	case "${i}" in
152	"1") run_install_auto ;;	"1") run_install_auto ;;
153	"2") run_install_normal ;;	"2") run_install_normal ;;
	"3") run_install_flash ;;
154	"") dialog_setup_system_menu;;	"") dialog_setup_system_menu;;
155	esac	esac
156	fi	fi
#	Line 180  dialog_hardware_detection()	Line 161  dialog_hardware_detection()
161	local i	local i
162	local hwtmp	local hwtmp
163
164	if [ -x $(which mktemp &> /dev/null) ]	if [ -x $(type -P mktemp) ]
165	then	then
166	hwtmp="$(mktemp)"	hwtmp="$(mktemp)"
167	else	else
168	hwtmp="/tmp/hwtmp.sh"	hwtmp="/tmp/hwtmp.sh"
169	fi	fi
170
171	[[ ! -z ${installdevs} ]] && installdevs=""	run_hardware_detection_disks
172
173	echo "dialog \\"  > ${hwtmp}	echo "dialog \\"  > ${hwtmp}
174	echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}	echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}
#	Line 197  dialog_hardware_detection()	Line 178  dialog_hardware_detection()
178	echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}	echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}
179	echo " Festplatten:\n \\" >> ${hwtmp}	echo " Festplatten:\n \\" >> ${hwtmp}
180
181	if [[ ! -z ${scsidisks} ]]	if [[ ! -z ${ALL_DISKS} ]]
182	then	then
183	for i in ${scsidisks}	for i in ${ALL_DISKS}
184	do	do
185	if [[ ${i} != ${cdromdev} ]]	echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp}
	then
	echo " \\Z7SCSI: \\Z3${i}\\Zn\n \\" >> ${hwtmp}
	installdevs="${installdevs} ${i}"
	fi
186	done	done
187	fi	fi
188
189	if [[ ! -z ${idedisks} ]]	if [[ ! -z ${ALL_CDROMS} ]]
190	then	then
191	for i in ${idedisks}	echo " \n \\" >> ${hwtmp}
192		echo " CDROM Laufwerke:\n \\" >> ${hwtmp}
193		for i in ${ALL_CDROMS}
194	do	do
195	if [[ ${i} != ${cdromdev} ]]	echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp}
	then
	echo " \\Z7IDE:  \\Z3${i}\\Zn\n \\" >> ${hwtmp}
	installdevs="${installdevs} ${i}"
	fi
196	done	done
197	fi	fi
198
	if [[ ! -z ${cdromdev} ]]
	then
	echo " \n \\" >> ${hwtmp}
	echo " \\Z7andere Laufwerke:\n \\" >> ${hwtmp}
	echo " CDROM: \\Z3${cdromdev}\\Zn\n \\" >> ${hwtmp}
	fi
199	# other devices	# other devices
200	run_hardware_detection	run_hardware_detection
201	case "${SPECIALDEVICE}" in	case "${SPECIALDEVICE}" in
#	Line 290  dialog_setup_hdd_partitions_manuell()	Line 258  dialog_setup_hdd_partitions_manuell()
258	fi	fi
259	}	}
260
261	dialog_setup_hdd_partitions_manuell_flash()	dialog_setup_hdd_partitions_auto()
262	{	{
263	local i	local i
264
#	Line 322  dialog_setup_hdd_partitions_manuell_flas	Line 290  dialog_setup_hdd_partitions_manuell_flas
290	[[ ${RES} -eq 1 ]] && return 1	[[ ${RES} -eq 1 ]] && return 1
291	if [[ ${RES} -eq 0 ]]	if [[ ${RES} -eq 0 ]]
292	then	then
293	dialog_setup_hdd_info_flash	dialog_setup_hdd_info_auto
294	setup_hdd_partitions_manuell_flash	dialog_setup_hdd_create_partitions
295		setup_hdd_partitions_auto
296	fi	fi
297	fi	fi
298	}	}
299
300	dialog_setup_hdd_partitions_auto()	run_hardware_detection_disks()
301	{	{
302	local i	local bootdev
303
304	if [[ -z ${installdevs} ]]	# all disks but exclude ramdisks
305		export ALL_DISKS=$(get_hwinfo disk | sed '/\/dev\/ram[0-9].*/d')
306		# remove the boot device from ALL_DISKS if it was an usbstick
307		if [[ $(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f3) != iso9660 ]]
308	then	then
309	dialog \	bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')"
310	--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
311	fi	fi
312		export ALL_CDROMS="$(get_hwinfo cdrom)"
313	}	}
314
315	dialog_setup_hdd_create_partitions()	dialog_setup_hdd_create_partitions()
#	Line 606  EOF	Line 551  EOF
551
552	setup_hdd_partitions_manuell()	setup_hdd_partitions_manuell()
553	{	{
	BOOTHDD="${HDD}1"
	SWAPHDD="${HDD}2"
	ROOTHDD="${HDD}3"
	## hdds partitionieren manuell
	cfdisk ${HDD} || dialog_die
	}
	setup_hdd_partitions_manuell_flash()
	{
554	ROOTHDD="${HDD}1"	ROOTHDD="${HDD}1"
555
556	## hdds partitionieren manuell	## hdds partitionieren manuell
#	Line 624  setup_hdd_partitions_manuell_flash()	Line 559  setup_hdd_partitions_manuell_flash()
559
560	setup_hdd_format()	setup_hdd_format()
561	{	{
	mkswap ${SWAPHDD} || dialog_die
	mke2fs -j -q ${BOOTHDD} || dialog_die
	mke2fs -j -q ${ROOTHDD} || dialog_die
	}
	setup_hdd_format_flash()
	{
562	mke2fs -j -q ${ROOTHDD} || dialog_die	mke2fs -j -q ${ROOTHDD} || dialog_die
563	}	}
564
565	install_mount_rootfs()	install_mount_rootfs()
566	{	{
	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()
	{
567	mount ${ROOTHDD} ${INSTALLROOT} || dialog_die	mount ${ROOTHDD} ${INSTALLROOT} || dialog_die
568	install -d ${INSTALLROOT}/boot || dialog_die	install -d ${INSTALLROOT}/boot || dialog_die
569	cd ${INSTALLROOT} || dialog_die	cd ${INSTALLROOT} || dialog_die
#	Line 829  CHROOTEOF	Line 748  CHROOTEOF
748
749	is_uuid_supported()	is_uuid_supported()
750	{	{
751	if [[ -x $(which busybox.mkinitrd &> /dev/null) ]]	if [[ -x $(type -P busybox.mkinitrd) ]]
752	then	then
753	# only detect uuids if supported	# only detect uuids if supported
754	if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]	if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]
#	Line 865  install_system_settings()	Line 784  install_system_settings()
784	# schreibe fstab	# schreibe fstab
785	if is_uuid_supported	if is_uuid_supported
786	then	then
	echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLROOT}/etc/fstab || dialog_die
787	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
788	else	else
	echo -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLROOT}/etc/fstab || dialog_die
789	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
790	fi	fi
791	# 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 810  install_system_settings()
810	fi	fi
811	}	}
812
	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
	}
813	install_umount_rootfs()	install_umount_rootfs()
814	{	{
815	cd /	cd /
816	umount ${INSTALLROOT}/boot || dialog_die	umount ${INSTALLROOT}/boot || dialog_die
817	umount ${INSTALLROOT} || dialog_die	umount ${INSTALLROOT} || dialog_die
	swapoff ${SWAPHDD} || dialog_die
	}
	install_umount_rootfs_flash()
	{
	cd /
	umount ${INSTALLROOT} || dialog_die
818	}	}
819
820	install_do_reboot()	install_do_reboot()
#	Line 951  run_install_normal()	Line 848  run_install_normal()
848	dialog_install_successful	dialog_install_successful
849	}	}
850
	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
	}
851	run_install_auto()	run_install_auto()
852	{	{
853	dialog_hardware_detection	dialog_hardware_detection
854
855	dialog_setup_hdd_partitions_auto	dialog_setup_hdd_partitions_auto
856	dialog_setup_hdd_format	dialog_setup_hdd_format
857	setup_hdd_format_flash > /dev/null	setup_hdd_format > /dev/null
858	install_mount_rootfs_flash	install_mount_rootfs
859	(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
860
861	dialog_install_settings	dialog_install_settings
862	sleep 1	sleep 1
863	install_system_settings_flash	install_system_settings
864	install_initrd_chroot	install_initrd_chroot
865
866	dialog_install_bootsector	dialog_install_bootsector
867	install_bootsector_chroot	install_bootsector_chroot
868
869	install_umount_rootfs_flash	install_umount_rootfs
870	dialog_install_successful	dialog_install_successful
871	}	}
872

---

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

Legend: Removed from v.2343   changed lines   Added in v.2401