/[magellan-source]/trunk/installer-simple/bin/installer.sh.in

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

Parent Directory | Revision Log | View Patch Patch

-revision 2323 by niro,
Fri Jan  3 13:19:11 2014 UTC
+revision 2404 by niro,
Tue Jan  7 13:20:20 2014 UTC
 Line 7
  # Niels Rogalla <niro@magellan-linux.de>
  #
- #images: (get ${CDIMAGENAME})
+ # ignore the environment
- source /mnt/cdrom/system/images.conf
+ LC_ALL=C
+ # include dir
+ INSTALLER_LIBDIR="%LIBDIR%"
- #Includes
+ # TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !
- source /usr/lib/installer/functions/findhdd.sh > /dev/null
+ # -> now in images.conf
- ### bugfix ###############################
+ CURRENTLINE=0
- cdromdev="$(echo ${cdromdev} | sed 's/ //')"
- ########################################
- ### System/Config Version
+ die()
- VERSION="%VERSIONTAG%"
+ {
- TITLE="Installer - ${VERSION}"
+ 	echo "Error: $@"
+ 	exit 1
+ }
- CDPATH="/mnt/cdrom"
+ # load common includes
- INSTALLPATH="/mnt/magellan"
+ for inc in %SYSCONFDIR%/installer.conf \
+ 	${INSTALLER_LIBDIR}/functions/common.sh \
+ 	${INSTALLER_LIBDIR}/functions/common-dialogs.sh \
+ 	${INSTALLER_LIBDIR}/functions/hwdetection.sh \
+ 	${INSTALLER_LIBDIR}/functions/installer-dialogs.sh
+ do
+ 	if [ -e ${inc} ]
+ 	then
+ 		source "${inc}"
+ 	else
+ 		die "'${inc}' not found"
+ 	fi
+ done
- ### WICHTIG: anzahl lines in der autosta_lx.tar.gz -1
+ # TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !
+ # -> now in images.conf
+ CDIMAGENAME=""
+ TOTALLINES=""
  CURRENTLINE=0
- #TOTALLINES=11072 # -> now in images.conf
+ if [ -e /mnt/cdrom/system/images.conf ]
+ then
+ 	source /mnt/cdrom/system/images.conf
+ 	# check if all required variables are set
+ 	[[ -z ${CDIMAGENAME} ]] && die "CDIMAGENAME is empty in /mnt/cdrom/system/images.conf"
+ 	[[ -z ${TOTALLINES} ]] && die "TOTALLINES is empty in /mnt/cdrom/system/images.conf"
+ else
+ 	die "/mnt/cdrom/system/images.conf not found"
+ fi
- # standard kernel opts
+ ### System/Config Version
- KERNELOPTS="quiet video=1024x768"
+ VERSION="%VERSIONTAG%"
+ TITLE="${DEFAULT_TITLE} - ${VERSION}"
- # grub options
+ # some sane defaults
+ CDROOT="${DEFAULT_CDROOT}"
+ INSTALLROOT="${DEFAULT_INSTALLROOT}"
+ KERNELPKG="${DEFAULT_KERNELPKG}"
+ KERNELOPTS="${DEFAULT_KERNELOPTS}"
  GRUBLEGACYOPTS=""
  GRUB2OPTS=""
- # fdisk options
  FDISKPARTIONBELOW256MB=0
- # default specialdevices
  SPECIALDEVICE=""
- FORMFACTOR="desktop"
+ FORMFACTOR="${DEFAULT_FORMFACTOR}"
+ FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}"
- # target filesystem
- FORMAT_FILESYSTEM="ext4"
  #################################################
  #		  DIALOG BOXEN			#
  #################################################
- die()
+ dialog_die()
  {
- 	ERROR=$1
+ 	ERROR="$1"
- 	RETVAL=$?
+ 	RETVAL="$?"
  	dialog_install_failure
  	exit 1
  }
  dialog_warning()
  {
- 	dialog \
+ 	local retval
- 	--backtitle "${TITLE}" \
- 	--colors \
+ 	yesnobox $"\Z1 !!! Warning !!! \Zn\n\n\This harddrive will be irreversibly erased.\n\n\Do you want to continue ?"
- 	--defaultno \
+ 	retval=$?
- 	--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 ]]
  	then
  		clear
- 		echo "Der Vorgang wurde abgebrochen."
+ 		echo $"The process was aborted."
  		exit 1
  	fi
  }
  dialog_setup_hdd_info()
  {
- 	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()
- {
  	local SHDD="$(echo $HDD | sed 's/\/dev\///')"
  	dialog \
-Line 133 
 dialog_setup_system_menu()
+Line 137 
 dialog_setup_system_menu()
  	"" "" \
  	"" "\Z1Experten Modi:\Zn" \
  	"2" "Normale IDE-Disk (Manuell)" \
- 	"3" "Flash-Speicher (Manuell)")
  	RES=$?
  	[[ ${RES} -eq 1 ]] && return 1
  	if [[ ${RES} -eq 0 ]]
  	then
  		case "${i}" in
  			"1") run_install_auto ;;
-         		"2") run_install_normal ;;
+ 			"2") run_install_normal ;;
- 			"3") run_install_flash ;;
  			"") dialog_setup_system_menu;;
  		esac
  	fi
-Line 152 
 dialog_hardware_detection()
+Line 154 
 dialog_hardware_detection()
  	local i
  	local hwtmp
- 	if [ -x $(which mktemp &> /dev/null) ]
+ 	if [ -x $(type -P mktemp) ]
  	then
  		hwtmp="$(mktemp)"
  	else
  		hwtmp="/tmp/hwtmp.sh"
  	fi
- 	[[ ! -z ${installdevs} ]] && installdevs=""
+ 	run_hardware_detection_disks
  	echo "dialog \\"  > ${hwtmp}
  	echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}
-Line 169 
 dialog_hardware_detection()
+Line 171 
 dialog_hardware_detection()
  	echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}
  	echo "	Festplatten:\n \\" >> ${hwtmp}
- 	if [[ ! -z ${scsidisks} ]]
+ 	if [[ ! -z ${ALL_DISKS} ]]
  	then
- 		for i in ${scsidisks}
+ 		for i in ${ALL_DISKS}
  		do
- 			if [[ ${i} != ${cdromdev} ]]
+ 			echo "		\\Z3${i}\\Zn\n \\" >> ${hwtmp}
- 			then
- 				echo "		\\Z7SCSI: \\Z3${i}\\Zn\n \\" >> ${hwtmp}
- 				installdevs="${installdevs} ${i}"
- 			fi
  		done
  	fi
- 	if [[ ! -z ${idedisks} ]]
+ 	if [[ ! -z ${ALL_CDROMS} ]]
  	then
- 		for i in ${idedisks}
+ 		echo "	\n \\" >> ${hwtmp}
+ 		echo "	CDROM Laufwerke:\n \\" >> ${hwtmp}
+ 		for i in ${ALL_CDROMS}
  		do
- 			if [[ ${i} != ${cdromdev} ]]
+ 			echo "		\\Z3${i}\\Zn\n \\" >> ${hwtmp}
- 			then
- 				echo "		\\Z7IDE:  \\Z3${i}\\Zn\n \\" >> ${hwtmp}
- 				installdevs="${installdevs} ${i}"
- 			fi
  		done
  	fi
- 	if [[ ! -z ${cdromdev} ]]
- 	then
- 		echo "	\n \\" >> ${hwtmp}
- 		echo "	\\Z7andere Laufwerke:\n \\" >> ${hwtmp}
- 		echo "		CDROM: \\Z3${cdromdev}\\Zn\n \\" >> ${hwtmp}
- 	fi
  	# other devices
  	run_hardware_detection
  	case "${SPECIALDEVICE}" in
-Line 262 
 dialog_setup_hdd_partitions_manuell()
+Line 251 
 dialog_setup_hdd_partitions_manuell()
  	fi
  }
- dialog_setup_hdd_partitions_manuell_flash()
+ dialog_setup_hdd_partitions_auto()
  {
  	local i
-Line 294 
 dialog_setup_hdd_partitions_manuell_flas
+Line 283 
 dialog_setup_hdd_partitions_manuell_flas
  		[[ ${RES} -eq 1 ]] && return 1
  		if [[ ${RES} -eq 0 ]]
  		then
- 			dialog_setup_hdd_info_flash
+ 			dialog_setup_hdd_info_auto
- 			setup_hdd_partitions_manuell_flash
+ 			dialog_setup_hdd_create_partitions
+ 			setup_hdd_partitions_auto
  		fi
  	fi
  }
- dialog_setup_hdd_partitions_auto()
+ run_hardware_detection_disks()
  {
- 	local i
+ 	local bootdev
- 	if [[ -z ${installdevs} ]]
+ 	# 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
- 		dialog \
+ 		bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')"
- 		--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
  	fi
+ 	export ALL_CDROMS="$(get_hwinfo cdrom)"
  }
  dialog_setup_hdd_create_partitions()
-Line 427 
 dialog_main()
+Line 393 
 dialog_main()
  		if [[ ${RES} -eq 0 ]]
  		then
  			case ${METHOD} in
-         			"1") dialog_setup_system_menu ;;
+ 				"1") dialog_setup_system_menu ;;
  				"2") dialog_hardware_detection ;;
  				"3") install_do_reboot ;;
  				"4") /bin/bash --login -i ;;
-Line 501 
 hdd_size_below_256mb()
+Line 467 
 hdd_size_below_256mb()
  	local hdd="$1"
  	local size
  	local retval
- 	[[ -z ${hdd} ]] && die "Error: get_hdd_size() no \$hdd given!"
+ 	[[ -z ${hdd} ]] && dialog_die "Error: get_hdd_size() no \$hdd given!"
  	size=$(fdisk -l ${hdd} | grep "Disk.*${hdd}" | sed 's:.*,\ \(.*\)\ byte.*:\1:')
  	if [[ ${size} -le 257000000 ]]
-Line 530 
 setup_hdd_partitions_auto()
+Line 496 
 setup_hdd_partitions_auto()
  	fi
  	## delete disk
- 	dd if=/dev/zero of=${HDD} count=1 &> /dev/null || die
+ 	dd if=/dev/zero of=${HDD} count=1 &> /dev/null || dialog_die
  	if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]
  	then
-Line 578 
 EOF
+Line 544 
 EOF
  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
+ 	cfdisk ${HDD} || dialog_die
  }
  setup_hdd_format()
  {
- 	mkswap ${SWAPHDD} || die
+ 	mke2fs -j -q ${ROOTHDD} || dialog_die
- 	mke2fs -j -q ${BOOTHDD} || die
- 	mke2fs -j -q ${ROOTHDD} || die
- }
- setup_hdd_format_flash()
- {
- 	mke2fs -j -q ${ROOTHDD} || die
  }
  install_mount_rootfs()
  {
- 	swapon ${SWAPHDD} || die
+ 	mount ${ROOTHDD} ${INSTALLROOT} || dialog_die
- 	mount ${ROOTHDD} ${INSTALLPATH} || die
+ 	install -d ${INSTALLROOT}/boot || dialog_die
- 	install -d ${INSTALLPATH}/boot || die
+ 	cd ${INSTALLROOT} || dialog_die
- 	mount ${BOOTHDD} ${INSTALLPATH}/boot || die
- 	cd ${INSTALLPATH} || die
- }
- install_mount_rootfs_flash()
- {
- 	mount ${ROOTHDD} ${INSTALLPATH} || die
- 	install -d ${INSTALLPATH}/boot || die
- 	cd ${INSTALLPATH} || die
  }
  install_system_image()
  {
- 	tar xvjpf ${CDPATH}/system/${CDIMAGENAME} -C ${INSTALLPATH}
+ 	tar xvjpf ${CDROOT}/system/${CDIMAGENAME} -C ${INSTALLROOT}
  }
  install_bootsector_chroot()
  {
  	local my_roothdd
- 	local grubconf=${INSTALLPATH}/boot/grub/grub.conf
+ 	local grubconf=${INSTALLROOT}/boot/grub/grub.conf
  	local grub2conf=/boot/grub/grub.cfg
  	# check for grub2
- 	if [[ -f ${INSTALLPATH}/sbin/grub-mkconfig ]]
+ 	if [[ -f ${INSTALLROOT}/sbin/grub-mkconfig ]]
  	then
  		# needed by grub-mkconfig on the first run
- 		if [[ ! -f ${INSTALLPATH}/boot/grub/video.lst ]]
+ 		if [[ ! -f ${INSTALLROOT}/boot/grub/video.lst ]]
  		then
- 			install -m0644 ${INSTALLPATH}/lib/grub/*/video.lst ${INSTALLPATH}/boot/grub/video.lst || die
+ 			install -m0644 ${INSTALLROOT}/lib/grub/*/video.lst ${INSTALLROOT}/boot/grub/video.lst || dialog_die
  		fi
  		# set kernelopts
- 		if [[ -f ${INSTALLPATH}/etc/conf.d/grub ]]
+ 		if [[ -f ${INSTALLROOT}/etc/conf.d/grub ]]
  		then
- 			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}\":" ${INSTALLROOT}/etc/conf.d/grub || dialog_die
  		else
- 			echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLPATH}/etc/conf.d/grub || die
+ 			echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLROOT}/etc/conf.d/grub || dialog_die
  		fi
- 		echo 'grub-mkdevicemap' > ${INSTALLPATH}/root/.installrc || die
+ 		echo 'grub-mkdevicemap' > ${INSTALLROOT}/root/.installrc || dialog_die
- 		echo "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null" >> ${INSTALLPATH}/root/.installrc || die
+ 		echo "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null" >> ${INSTALLROOT}/root/.installrc || dialog_die
- 		echo "grub-install --no-floppy ${HDD} &> /dev/null" >> ${INSTALLPATH}/root/.installrc || die
+ 		echo "grub-install --no-floppy ${HDD} &> /dev/null" >> ${INSTALLROOT}/root/.installrc || dialog_die
- 		echo "exit 0" >> ${INSTALLPATH}/root/.installrc || die
+ 		echo "exit 0" >> ${INSTALLROOT}/root/.installrc || dialog_die
  	# grub-legacy
  	else
  		### grubconf schreiben
- 		source ${INSTALLPATH}/boot/kernelversion
+ 		source ${INSTALLROOT}/boot/kernelversion
  		#for alx only
- 		if [ -e ${INSTALLPATH}/etc/alx_version ]
+ 		if [ -e ${INSTALLROOT}/etc/alx_version ]
  		then
  			OLD_ALXVER="${ALXVER}"
- 			source ${INSTALLPATH}/etc/alx_version
+ 			source ${INSTALLROOT}/etc/alx_version
  			KRNVER="ALX-${ALXVER}"
  			ALXVER="${OLD_ALXVER}"
  		fi
-Line 680 
 install_bootsector_chroot()
+Line 620 
 install_bootsector_chroot()
  			my_roothdd="${ROOTHDD}"
  		fi
- 		: > ${grubconf} || die
+ 		: > ${grubconf} || dialog_die
- 		echo "default 0" >> ${grubconf} || die
+ 		echo "default 0" >> ${grubconf} || dialog_die
- 		echo "timeout 3" >> ${grubconf} || die
+ 		echo "timeout 3" >> ${grubconf} || dialog_die
  		# using current root password
- 		echo "password --md5 $(cat ${INSTALLPATH}/etc/shadow | grep root | cut -d: -f2)"  >> ${grubconf} || die
+ 		echo "password --md5 $(cat ${INSTALLROOT}/etc/shadow | grep root | cut -d: -f2)"  >> ${grubconf} || dialog_die
- 		echo  >> ${grubconf} || die
+ 		echo  >> ${grubconf} || dialog_die
- 		echo "# normal boot" >> ${grubconf} || die
+ 		echo "# normal boot" >> ${grubconf} || dialog_die
- 		echo "title ${KRNVER}" >> ${grubconf} || die
+ 		echo "title ${KRNVER}" >> ${grubconf} || dialog_die
- 		echo "root (hd0,0)" >> ${grubconf} || die
+ 		echo "root (hd0,0)" >> ${grubconf} || dialog_die
- 		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}" >> ${grubconf} || die
+ 		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}" >> ${grubconf} || dialog_die
  		if is_initrd_supported
  		then
- 			echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
+ 			echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die
  		fi
- 		echo >> ${grubconf} || die
+ 		echo >> ${grubconf} || dialog_die
- 		echo "# admin boot" >> ${grubconf} || die
+ 		echo "# admin boot" >> ${grubconf} || dialog_die
- 		echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || die
+ 		echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || dialog_die
- 		echo "lock"  >> ${grubconf} || die
+ 		echo "lock"  >> ${grubconf} || dialog_die
- 		echo "root (hd0,0)" >> ${grubconf} || die
+ 		echo "root (hd0,0)" >> ${grubconf} || dialog_die
- 		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} hardware-auto-detection" >> ${grubconf} || die
+ 		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} hardware-auto-detection" >> ${grubconf} || dialog_die
  		if is_initrd_supported
  		then
- 			echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
+ 			echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die
  		fi
- 		echo >> ${grubconf} || die
+ 		echo >> ${grubconf} || dialog_die
- 		echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || die
+ 		echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || dialog_die
- 		echo "lock"  >> ${grubconf} || die
+ 		echo "lock"  >> ${grubconf} || dialog_die
- 		echo "root (hd0,0)" >> ${grubconf} || die
+ 		echo "root (hd0,0)" >> ${grubconf} || dialog_die
- 		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} alx-reset-settings" >> ${grubconf} || die
+ 		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} alx-reset-settings" >> ${grubconf} || dialog_die
  		if is_initrd_supported
  		then
- 			echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
+ 			echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die
  		fi
  		# bootsector schreiben chrooted schreiben (lfs/magellan)
- 		cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF
+ 		cat > ${INSTALLROOT}/root/.installrc << CHROOTEOF
  /usr/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null
  root (hd0,0)
  setup (hd0)
-Line 728 
 exit 0
+Line 668 
 exit 0
  CHROOTEOF
  	fi
- 	## enters chroot
+ 	## enter chroot
- 	mount -t proc proc ${INSTALLPATH}/proc
+ 	mount -t proc proc ${INSTALLROOT}/proc
- 	mount -t sysfs sysfs ${INSTALLPATH}/sys
+ 	mount -t sysfs sysfs ${INSTALLROOT}/sys
- 	mount -o bind /dev ${INSTALLPATH}/dev
+ 	mount -o bind /dev ${INSTALLROOT}/dev
- 	chroot ${INSTALLPATH} /bin/bash --rcfile /root/.installrc -i
+ 	chroot ${INSTALLROOT} /bin/bash --rcfile /root/.installrc -i
- 	umount ${INSTALLPATH}/proc
+ 	umount ${INSTALLROOT}/proc
- 	umount ${INSTALLPATH}/sys
+ 	umount ${INSTALLROOT}/sys
- 	umount ${INSTALLPATH}/dev
+ 	umount ${INSTALLROOT}/dev
- 	rm ${INSTALLPATH}/root/.installrc
+ 	rm ${INSTALLROOT}/root/.installrc
  }
  is_initrd_supported()
  {
  	# only generate initrds if the cmd exists
- 	[[ -x ${INSTALLPATH}/sbin/mkinitrd ]] && return 0
+ 	[[ -x ${INSTALLROOT}/sbin/mkinitrd ]] && return 0
  	return 1
  }
-Line 773 
 install_initrd_chroot()
+Line 713 
 install_initrd_chroot()
  	fi
  	# install an appropriate uvesafb.conf
- 	install -d ${INSTALLPATH}/etc/modprobe.d || die
+ 	install -d ${INSTALLROOT}/etc/modprobe.d || dialog_die
- 	echo "options uvesafb mode_option=1024x768-32@60 scroll=ywrap" > ${INSTALLPATH}/etc/modprobe.d/uvesafb.conf || die
+ 	echo "options uvesafb mode_option=1024x768-32@60 scroll=ywrap" > ${INSTALLROOT}/etc/modprobe.d/uvesafb.conf || dialog_die
  	# install an appropriate viafb.conf
- 	echo "options viafb viafb_mode=1024x768 viafb_refresh=60" > ${INSTALLPATH}/etc/modprobe.d/viafb.conf || die
+ 	echo "options viafb viafb_mode=1024x768 viafb_refresh=60" > ${INSTALLROOT}/etc/modprobe.d/viafb.conf || dialog_die
  	# install an appropriate i810fb.conf
- 	echo "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"  > ${INSTALLPATH}/etc/modprobe.d/i810fb.conf || die
+ 	echo "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"  > ${INSTALLROOT}/etc/modprobe.d/i810fb.conf || dialog_die
- 	cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF
+ 	cat > ${INSTALLROOT}/root/.installrc << CHROOTEOF
  echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS} ${OTHERMODS}\"" > /etc/conf.d/mkinitrd
  mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g") > /dev/null
  exit 0
  CHROOTEOF
  	## enters chroot
- 	mount -t proc proc ${INSTALLPATH}/proc
+ 	mount -t proc proc ${INSTALLROOT}/proc
- 	mount -t sysfs sysfs ${INSTALLPATH}/sys
+ 	mount -t sysfs sysfs ${INSTALLROOT}/sys
- 	mount -o bind /dev ${INSTALLPATH}/dev
+ 	mount -o bind /dev ${INSTALLROOT}/dev
- 	chroot ${INSTALLPATH} /bin/bash --rcfile /root/.installrc -i
+ 	chroot ${INSTALLROOT} /bin/bash --rcfile /root/.installrc -i
- 	umount ${INSTALLPATH}/proc
+ 	umount ${INSTALLROOT}/proc
- 	umount ${INSTALLPATH}/sys
+ 	umount ${INSTALLROOT}/sys
- 	umount ${INSTALLPATH}/dev
+ 	umount ${INSTALLROOT}/dev
- 	rm ${INSTALLPATH}/root/.installrc
+ 	rm ${INSTALLROOT}/root/.installrc
  }
  is_uuid_supported()
  {
- 	if [[ -x $(which busybox.mkinitrd &> /dev/null) ]]
+ 	if [[ -x $(type -P busybox.mkinitrd) ]]
  	then
  		# only detect uuids if supported
  		if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]
-Line 820 
 get_uuid()
+Line 760 
 get_uuid()
  	local TYPE
  	local dev="$1"
- 	[[ -z ${dev} ]] && die "no dev given"
+ 	[[ -z ${dev} ]] && dialog_die "no dev given"
  	# check if given device is already an UUID
  	if [[ ${dev/UUID=/}x != ${dev}x ]]
-Line 837 
 install_system_settings()
+Line 777 
 install_system_settings()
  	# schreibe fstab
  	if is_uuid_supported
  	then
- 		echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
+ 		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" >> ${INSTALLPATH}/etc/fstab || die
  	else
- 		echo -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
+ 		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" >> ${INSTALLPATH}/etc/fstab || die
  	fi
  	# not needed busybox loads all with swapon -a, even if not mentioned in fstab
- 	#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" >> ${INSTALLROOT}/etc/fstab || dialog_die
- 	echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
+ 	echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die
- 	echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
+ 	echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die
  	# install network config skeleton
- 	install -m0644 ${INSTALLPATH}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALLPATH}/etc/conf.d/ || die
+ 	install -m0644 ${INSTALLROOT}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALLROOT}/etc/conf.d/ || dialog_die
  	# intel framebufer quirk
  	if [[ -e /proc/fb ]]
-Line 859 
 install_system_settings()
+Line 797 
 install_system_settings()
  			fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')
  			if [[ ${fbdev} != 0 ]]
  			then
- 				sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLPATH}/etc/splash/splash.conf || die
+ 				sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLROOT}/etc/splash/splash.conf || dialog_die
  			fi
  		fi
  	fi
  }
- 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
- }
  install_umount_rootfs()
  {
  	cd /
- 	umount ${INSTALLPATH}/boot || die
+ 	umount ${INSTALLROOT}/boot || dialog_die
- 	umount ${INSTALLPATH} || die
+ 	umount ${INSTALLROOT} || dialog_die
- 	swapoff ${SWAPHDD} || die
- }
- install_umount_rootfs_flash()
- {
- 	cd /
- 	umount ${INSTALLPATH} || die
  }
  install_do_reboot()
-Line 923 
 run_install_normal()
+Line 841 
 run_install_normal()
  	dialog_install_successful
  }
- 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
+ 	setup_hdd_format > /dev/null
- 	install_mount_rootfs_flash
+ 	install_mount_rootfs
  	(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_system_settings
  	install_initrd_chroot
  	dialog_install_bootsector
  	install_bootsector_chroot
- 	install_umount_rootfs_flash
+ 	install_umount_rootfs
  	dialog_install_successful
  }

 Legend:



Removed from v.2323
 


changed lines


 
Added in v.2404
 Legend:



Removed from v.2323
 


changed lines


 
Added in v.2404
-Removed from v.2323
+Added in v.2404