/[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 2419 by niro,
Tue Jan  7 13:44:59 2014 UTC
+revision 2477 by niro,
Wed Jan  8 10:21:09 2014 UTC
 Line 7
  # Niels Rogalla <niro@magellan-linux.de>
  #
- # ignore the environment
+ # setup locales
- LC_ALL=C
+ TEXTDOMAIN=installer
+ LC_MESSAGES=C
  # include dir
  INSTALLER_LIBDIR="%LIBDIR%"
-Line 27 
 for inc in %SYSCONFDIR%/installer.conf \
+Line 29 
 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/bootloader.sh \
+ 	${INSTALLER_LIBDIR}/functions/initrd-tools.sh \
  	${INSTALLER_LIBDIR}/functions/installer-dialogs.sh
  do
  	if [ -e ${inc} ]
-Line 106 
 dialog_warning()
+Line 110 
 dialog_warning()
  	fi
  }
- dialog_setup_hdd_info()
+ task_setup_system_menu()
- {
- 	local SHDD="${HDD//\/dev\/}"
- 	messagebox -h $"[ Harddrive partitioning ]" \
- 		$"\nPlease create 1 partition.\n\n\[ \Z3${SHDD}1\Zn ] type: \Z3linux\Zn with the whole diskspace\n\Please mark ${SHDD}1 \Z3bootable\Zn."
- }
- dialog_setup_hdd_info_auto()
- {
- 	local SHDD="${HDD//\/dev\/}"
- 	messagebox -h $"[ Harddrive partitioning ]" \
- 		$"\Z1Warning!\Zn\n\nAll data on disk [ \Z3${HDD}\Zn ] will be erased!"
- }
- dialog_setup_system_menu()
  {
  	local mode
  	local retval
- 	mode=$(menubox -h $"[ Harddrive partitioning ]" $"\nSelect an installation mode" \
+ 	mode="$(dialog_setup_system_menu)"
- 		$"1:Automatic setup (recommended)" \
- 		":" \
- 		$":\Z1Expert modes:\Zn" \
- 		$"2:Common IDE-disk (manual setup)")
  	retval=$?
  	[[ ${retval} -eq 1 ]] && return 1
  	if [[ ${retval} -eq 0 ]]
-Line 139 
 dialog_setup_system_menu()
+Line 123 
 dialog_setup_system_menu()
  		case "${mode}" in
  			"1") run_install_auto ;;
  			"2") run_install_normal ;;
- 			"") dialog_setup_system_menu;;
+ 			"") task_setup_system_menu;;
  		esac
  	fi
  }
-Line 178 
 dialog_hardware_detection()
+Line 162 
 dialog_hardware_detection()
  		zotac*) message+=$"\n\Z2Zotac device detected.\Zn" ;;
  		rangee) message+=$"\n\Z2Rangee device detected.\Zn" ;;
  		maxdata) message+=$"\n\Z2Maxdata device detected.\Zn" ;;
- 		*) message+=$"\n \\ZnCommon device detected.\Zn" ;;
+ 		*) message+=$"\n\ZnCommon device detected.\Zn" ;;
  	esac
  	if [[ ${FORMFACTOR} = laptop ]]
  	then
- 		message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving  mode.\Zn"
+ 		message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving mode.\Zn"
  	fi
- 	messagebox -y 15 -h $"Detected hardware:" "${message}"
+ 	messagebox -y 12 -h $"Detected hardware:" "${message}"
  }
  dialog_setup_hdd_partitions_manual()
  {
  	local i
+ 	local retval
  	if [[ -z ${ALL_DISKS} ]]
  	then
- 		dialog \
+ 		dialog_no_harddrive_found
- 		--backtitle "${TITLE}" \
- 		--ok-label "Beenden" \
- 		--msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70
  		exit 1
  	else
+ 		HDD=$(dialog_select_target_harddrive)
- 		echo "dialog \\" > /tmp/hddtmp.sh
+ 		retval=$?
- 		echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh
+ 		[[ ${retval} -eq 1 ]] && return 1
- 		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 ${ALL_DISKS}
- 		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
  			setup_hdd_partitions_manual
-Line 229 
 dialog_setup_hdd_partitions_manual()
+Line 196 
 dialog_setup_hdd_partitions_manual()
  dialog_setup_hdd_partitions_auto()
  {
  	local i
+ 	local retval
  	if [[ -z ${ALL_DISKS} ]]
  	then
- 		dialog \
+ 		dialog_no_harddrive_found
- 		--backtitle "${TITLE}" \
- 		--ok-label "Beenden" \
- 		--msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70
  		exit 1
  	else
+ 		HDD=$(dialog_select_target_harddrive)
- 		echo "dialog \\" > /tmp/hddtmp.sh
+ 		retval=$?
- 		echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh
+ 		[[ ${retval} -eq 1 ]] && return 1
- 		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 ${ALL_DISKS}
- 		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
-Line 265 
 dialog_setup_hdd_partitions_auto()
+Line 215 
 dialog_setup_hdd_partitions_auto()
  	fi
  }
- run_hardware_detection_disks()
+ install_meter()
- {
- 	local bootdev
- 	# 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
- 		bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')"
- 		export ALL_DISKS=$(echo "${ALL_DISKS}" | grep -v "${bootdev}")
- 	fi
- 	export ALL_CDROMS="$(get_hwinfo cdrom)"
- }
- dialog_setup_hdd_create_partitions()
- {
- 	dialog \
- 	--backtitle "${TITLE}" \
- 	--infobox "Erstelle Disk Partitionen ..." 3 70
- }
- dialog_setup_hdd_format()
- {
- 	dialog \
- 	--backtitle "${TITLE}" \
- 	--infobox "Erstelle Datei-Systeme ..." 3 70
- }
- dialog_install_settings()
- {
- 	dialog \
- 	--backtitle "${TITLE}" \
- 	--infobox "Speichere System-Einstellungen ..." 3 70
- }
- dialog_install_system_image()
- {
- 	dialog \
- 	--backtitle "${TITLE}" \
- 	--gauge "Kopiere System-Image ..." 6 80
- }
- dialog_install_meter()
  {
  	while [[ ${CURRENTLINE} != ${TOTALLINES} ]]
  	do
-Line 321 
 dialog_install_meter()
+Line 228 
 dialog_install_meter()
  	return 0
  }
+ task_main()
- dialog_install_bootsector()
- {
- 	dialog \
- 	--backtitle "${TITLE}" \
- 	--infobox "Schreibe den Bootsektor ..." 3 70
- }
- dialog_install_successful()
  {
- 	dialog \
+ 	local method=0
- 	--backtitle "${TITLE}" \
+ 	local retval
- 	--colors \
- 	--msgbox "Die Installation war \Z2erfolgreich\Zn." 5 81
- }
- dialog_install_failure()
- {
- 	dialog \
- 	--backtitle "${TITLE}" \
- 	--colors \
- 	--msgbox "Die Installation ist \Z1Fehlgeschlagen\Zn.\n\n\
- 		Fehler bei ${ERROR}, RetVal: ${RETVAL} \
- 	" 10 81
- }
- dialog_main()
- {
- 	METHOD=0
- 	while [[ ${METHOD} -le 2 ]]
+ 	while [[ ${method} -le 2 ]]
  	do
- 		METHOD=$(dialog \
+ 		method=$(dialog_main)
- 		--backtitle "${TITLE}" \
+ 		retval=$?
- 		--no-cancel \
+ 		[[ ${retval} -eq 1 ]] && exit 1
- 		--ok-label "Weiter" \
+ 		if [[ ${retval} -eq 0 ]]
- 		--stdout \
- 		--menu "Konfiguration" 14 70 5 \
- 		"1" "AutoSta_LX installieren" \
- 		"2" "Uebersicht gefundener Laufwerke" \
- 		"3" "Beenden und neustarten" \
- 		"4" "Beenden und eine Shell starten")
- 		RES=$?
- 		[[ ${RES} -eq 1 ]] && exit 1
- 		if [[ ${RES} -eq 0 ]]
  		then
- 			case ${METHOD} in
+ 			case ${method} in
- 				"1") dialog_setup_system_menu ;;
+ 				"1") task_setup_system_menu ;;
  				"2") dialog_hardware_detection ;;
  				"3") install_do_reboot ;;
  				"4") /bin/bash --login -i ;;
-Line 386 
 run_hardware_detection()
+Line 259 
 run_hardware_detection()
  	hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"
- 	# check for special devices/clients:
+ 	## check for special devices/clients:
- 	# if zotac a zotac and the disk is a removeable device, then add rootdelay to kernelcmd
+ 	## if zotac a zotac and the disk is a removeable device, then add rootdelay to kernelcmd
- 	local removable=0
+ 	#local removable=0
- 	if [[ ! -z $(echo "${hwinfo}" | grep -i zotac) ]]
+ 	#if [[ ! -z $(echo "${hwinfo}" | grep -i zotac) ]]
- 	then
+ 	#then
- 		for i in /sys/block/[hs]d*/removable
+ 		#for i in /sys/block/[hs]d*/removable
- 		do
+ 		#do
- 			if [[ $(< ${i}) = 1 ]]
+ 			#if [[ $(< ${i}) = 1 ]]
- 			then
+ 			#then
- 				removable=1
+ 				#removable=1
- 			fi
+ 			#fi
- 		done
+ 		#done
+ 		## smartcard = udevadm info -n /dev/sda -a | grep -i 'configuration.*card'
- 		# only add this for grub legacy, grub2 detect these settings on its own
- 		export GRUBLEGACYOPTS="rootdelay=8"
+ 		## only add this for grub legacy, grub2 detect these settings on its own
- 		# there are to zotac types in the wild, nvidia based gfx and intel
+ 		#export GRUBLEGACYOPTS="rootdelay=8"
- 		if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]
+ 		## there are to zotac types in the wild, nvidia based gfx and intel
- 		then
+ 		#if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]
- 			export SPECIALDEVICE="zotac_nvidia"
+ 		#then
- 		else
+ 			#export SPECIALDEVICE="zotac_nvidia"
- 			export SPECIALDEVICE="zotac_intel"
+ 		#else
- 		fi
+ 			#export SPECIALDEVICE="zotac_intel"
- 	fi
+ 		#fi
+ 	#fi
  	# check for special devices/clients:
  	# if a rangee and disk ist smaller then 256mb move partion one block further ahead
-Line 437 
 run_hardware_detection()
+Line 311 
 run_hardware_detection()
  	fi
  }
- hdd_size_below_256mb()
+ run_hardware_detection_disks()
  {
- 	local hdd="$1"
+ 	local bootdev
- 	local size
- 	local retval
- 	[[ -z ${hdd} ]] && dialog_die "Error: get_hdd_size() no \$hdd given!"
- 	size=$(fdisk -l ${hdd} | grep "Disk.*${hdd}" | sed 's:.*,\ \(.*\)\ byte.*:\1:')
+ 	# all disks but exclude ramdisks
- 	if [[ ${size} -le 257000000 ]]
+ 	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
- 		retval="0"
+ 		bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')"
- 	else
+ 		export ALL_DISKS=$(echo "${ALL_DISKS}" | grep -v "${bootdev}")
- 		retval="1"
  	fi
+ 	export ALL_CDROMS="$(get_hwinfo cdrom)"
- 	return "${retval}"
  }
  setup_hdd_partitions_auto()
  {
  	ROOTHDD="${HDD}1"
+ 	# sanity check - should not happen
+ 	if is_mounted --device "${ROOTHDD}"
+ 	then
+ 		echo "partition: device ${ROOTHDD} is already mounted, umount it" >&2
+ 		umount "${ROOTHDD}"
+ 	fi
  	# run this only if FDISKPARTITIONBELOW256MB is not already 1
  	if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
  	then
-Line 520 
 EOF
+Line 398 
 EOF
  setup_hdd_partitions_manual()
  {
  	ROOTHDD="${HDD}1"
+ 	SWAPHDD=""
- 	## hdds partitionieren manual
+ 	BOOTHDD=""
  	cfdisk ${HDD} || dialog_die
  }
  setup_hdd_format()
  {
- 	mke2fs -j -q ${ROOTHDD} || dialog_die
+ 	# sanity check - should not happen
+ 	if is_mounted --device "${ROOTHDD}"
+ 	then
+ 		echo "format: device ${ROOTHDD} is already mounted, umount it" >&2
+ 		umount "${ROOTHDD}"
+ 	fi
+ 	mkfs."${FORMAT_FILESYSTEM}" -q "${ROOTHDD}" || dialog_die
  }
  install_mount_rootfs()
  {
- 	mount ${ROOTHDD} ${INSTALLROOT} || dialog_die
+ 	is_mounted --location "${INSTALLROOT}" || mount "${ROOTHDD}" "${INSTALLROOT}"
  	install -d ${INSTALLROOT}/boot || dialog_die
- 	cd ${INSTALLROOT} || dialog_die
  }
  install_system_image()
  {
+ 	pushd ${INSTALLROOT} > /dev/null
  	tar xvjpf ${CDROOT}/system/${CDIMAGENAME} -C ${INSTALLROOT}
+ 	popd > /dev/null
  }
- install_bootsector_chroot()
+ disabled_install_bootsector_chroot()
  {
  	local my_roothdd
- 	local grubconf=${INSTALLROOT}/boot/grub/grub.conf
+ 	local grubconf="${INSTALLROOT}/boot/grub/grub.conf"
- 	local grub2conf=/boot/grub/grub.cfg
+ 	local grub2conf="/boot/grub/grub.cfg"
  	# check for grub2
  	if [[ -f ${INSTALLROOT}/sbin/grub-mkconfig ]]
-Line 562 
 install_bootsector_chroot()
+Line 448 
 install_bootsector_chroot()
  		then
  			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}\"" >  ${INSTALLROOT}/etc/conf.d/grub || dialog_die
+ 			CONFIG="${INSTALLROOT}/etc/conf.d/grub"
- 		fi
+ 			clearconfig
- 		echo 'grub-mkdevicemap' > ${INSTALLROOT}/root/.installrc || dialog_die
+ 			addconfig "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\""
- 		echo "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null" >> ${INSTALLROOT}/root/.installrc || dialog_die
+ 		fi
- 		echo "grub-install --no-floppy ${HDD} &> /dev/null" >> ${INSTALLROOT}/root/.installrc || dialog_die
+ 		CONFIG="${INSTALLROOT}/root/.installrc"
- 		echo "exit 0" >> ${INSTALLROOT}/root/.installrc || dialog_die
+ 		clearconfig
+ 		# only grub 1.99
+ 		addconfig 'type -P grub-mkdevicemap && grub-mkdevicemap'
+ 		addconfig "grub-install --no-floppy ${HDD} &> /dev/null"
+ 		addconfig "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null"
+ 		addconfig "exit 0"
  	# grub-legacy
  	else
- 		### grubconf schreiben
  		source ${INSTALLROOT}/boot/kernelversion
- 		#for alx only
  		if [ -e ${INSTALLROOT}/etc/alx_version ]
  		then
  			OLD_ALXVER="${ALXVER}"
-Line 588 
 install_bootsector_chroot()
+Line 477 
 install_bootsector_chroot()
  		[[ -z ${KRNIMG} ]] && KRNIMG="vmlinuz"
  		# uuid support
- 		if is_uuid_supported
+ 		my_roothdd="UUID=$(get_uuid ${ROOTHDD})"
- 		then
- 			my_roothdd="UUID=$(get_uuid ${ROOTHDD})"
- 		else
- 			my_roothdd="${ROOTHDD}"
- 		fi
- 		: > ${grubconf} || dialog_die
+ 		CONFIG="${grubconf}"
- 		echo "default 0" >> ${grubconf} || dialog_die
+ 		clearconfig
- 		echo "timeout 3" >> ${grubconf} || dialog_die
+ 		addconfig "default 0"
+ 		addconfig "timeout 3"
  		# using current root password
- 		echo "password --md5 $(cat ${INSTALLROOT}/etc/shadow | grep root | cut -d: -f2)"  >> ${grubconf} || dialog_die
+ 		addconfig "password --md5 $(cat ${INSTALLROOT}/etc/shadow | grep root | cut -d: -f2)"
- 		echo  >> ${grubconf} || dialog_die
+ 		addconfig
- 		echo "# normal boot" >> ${grubconf} || dialog_die
+ 		addconfig "# normal boot"
- 		echo "title ${KRNVER}" >> ${grubconf} || dialog_die
+ 		addconfig "title ${KRNVER}"
- 		echo "root (hd0,0)" >> ${grubconf} || dialog_die
+ 		addconfig "root (hd0,0)"
- 		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}" >> ${grubconf} || dialog_die
+ 		addconfig "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}"
  		if is_initrd_supported
  		then
- 			echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die
+ 			addconfig "initrd /boot/${KRNINITRD}"
  		fi
- 		echo >> ${grubconf} || dialog_die
+ 		addconfig
- 		echo "# admin boot" >> ${grubconf} || dialog_die
+ 		addconfig "# admin boot"
- 		echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || dialog_die
+ 		addconfig "title ${KRNVER} - Re-run hardware-detection"
- 		echo "lock"  >> ${grubconf} || dialog_die
+ 		addconfig "lock"
- 		echo "root (hd0,0)" >> ${grubconf} || dialog_die
+ 		addconfig "root (hd0,0)"
- 		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} hardware-auto-detection" >> ${grubconf} || dialog_die
+ 		addconfig "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} hardware-auto-detection"
  		if is_initrd_supported
  		then
- 			echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die
+ 			addconfig "initrd /boot/${KRNINITRD}"
  		fi
- 		echo >> ${grubconf} || dialog_die
+ 		addconfig
- 		echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || dialog_die
+ 		addconfig "title ${KRNVER} - Reset *all* local settings"
- 		echo "lock"  >> ${grubconf} || dialog_die
+ 		addconfig "lock"
- 		echo "root (hd0,0)" >> ${grubconf} || dialog_die
+ 		addconfig "root (hd0,0)"
- 		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} alx-reset-settings" >> ${grubconf} || dialog_die
+ 		addconfig "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} alx-reset-settings"
  		if is_initrd_supported
  		then
- 			echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || dialog_die
+ 			addconfig "initrd /boot/${KRNINITRD}"
  		fi
  		# bootsector schreiben chrooted schreiben (lfs/magellan)
-Line 643 
 exit 0
+Line 528 
 exit 0
  CHROOTEOF
  	fi
- 	## enter chroot
+ 	# run installrc
- 	mount -t proc proc ${INSTALLROOT}/proc
+ 	chrooted /bin/bash --rcfile /root/.installrc -i
- 	mount -t sysfs sysfs ${INSTALLROOT}/sys
- 	mount -o bind /dev ${INSTALLROOT}/dev
- 	chroot ${INSTALLROOT} /bin/bash --rcfile /root/.installrc -i
- 	umount ${INSTALLROOT}/proc
- 	umount ${INSTALLROOT}/sys
- 	umount ${INSTALLROOT}/dev
  	rm ${INSTALLROOT}/root/.installrc
  }
- is_initrd_supported()
+ disabled_install_initrd_chroot()
- {
- 	# only generate initrds if the cmd exists
- 	[[ -x ${INSTALLROOT}/sbin/mkinitrd ]] && return 0
- 	return 1
- }
- install_initrd_chroot()
  {
  	# only generate initrds if the cmd exists
  	is_initrd_supported || return 0
-Line 689 
 install_initrd_chroot()
+Line 561 
 install_initrd_chroot()
  	# install an appropriate uvesafb.conf
  	install -d ${INSTALLROOT}/etc/modprobe.d || dialog_die
- 	echo "options uvesafb mode_option=1024x768-32@60 scroll=ywrap" > ${INSTALLROOT}/etc/modprobe.d/uvesafb.conf || dialog_die
+ 	CONFIG="${INSTALLROOT}/etc/modprobe.d/uvesafb.conf"
+ 	clearconfig
+ 	addconfig "options uvesafb mode_option=1024x768-32@60 scroll=ywrap"
  	# install an appropriate viafb.conf
- 	echo "options viafb viafb_mode=1024x768 viafb_refresh=60" > ${INSTALLROOT}/etc/modprobe.d/viafb.conf || dialog_die
+ 	CONFIG="${INSTALLROOT}/etc/modprobe.d/viafb.conf"
+ 	clearconfig
+ 	addconfig "options viafb viafb_mode=1024x768 viafb_refresh=60"
  	# install an appropriate i810fb.conf
- 	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
+ 	CONFIG="${INSTALLROOT}/etc/modprobe.d/i810fb.conf"
+ 	clearconfig
+ 	addconfig "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"
  	cat > ${INSTALLROOT}/root/.installrc << CHROOTEOF
  echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS} ${OTHERMODS}\"" > /etc/conf.d/mkinitrd
-Line 703 
 mkinitrd -f /boot/$(readlink /boot/initr
+Line 581 
 mkinitrd -f /boot/$(readlink /boot/initr
  exit 0
  CHROOTEOF
- 	## enters chroot
+ 	# run installrc
- 	mount -t proc proc ${INSTALLROOT}/proc
+ 	chrooted /bin/bash --rcfile /root/.installrc -i
- 	mount -t sysfs sysfs ${INSTALLROOT}/sys
- 	mount -o bind /dev ${INSTALLROOT}/dev
- 	chroot ${INSTALLROOT} /bin/bash --rcfile /root/.installrc -i
- 	umount ${INSTALLROOT}/proc
- 	umount ${INSTALLROOT}/sys
- 	umount ${INSTALLROOT}/dev
  	rm ${INSTALLROOT}/root/.installrc
  }
- is_uuid_supported()
- {
- 	if [[ -x $(type -P busybox.mkinitrd) ]]
- 	then
- 		# only detect uuids if supported
- 		if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]
- 		then
- 			return 0
- 		fi
- 	fi
- 	return 1
- }
- get_uuid()
- {
- 	local UUID
- 	local SEC_TYPE
- 	local TYPE
- 	local dev="$1"
- 	[[ -z ${dev} ]] && dialog_die "no dev given"
- 	# check if given device is already an UUID
- 	if [[ ${dev/UUID=/}x != ${dev}x ]]
- 	then
- 		eval "${dev}"
- 	else
- 		eval $(busybox.mkinitrd blkid ${dev} | grep "${dev}:" | sed 's/.*:\ //')
- 	fi
- 	echo "${UUID}"
- }
  install_system_settings()
  {
- 	# schreibe fstab
+ 	local CONFIG
- 	if is_uuid_supported
- 	then
+ 	# write fstab
- 		echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die
+ 	CONFIG="${INSTALLROOT}/etc/fstab"
- 	else
+ 	clearconfig
- 		echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die
+ 	addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1"
- 	fi
+ 	addconfig -e "proc\t/proc\tproc\tdefaults\t0 0"
- 	# not needed busybox loads all with swapon -a, even if not mentioned in fstab
+ 	addconfig -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0"
- 	#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" >> ${INSTALLROOT}/etc/fstab || dialog_die
- 	echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die
  	# install network config skeleton
- 	install -m0644 ${INSTALLROOT}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALLROOT}/etc/conf.d/ || dialog_die
+ 	CONFIG="${INSTALLROOT}/etc/conf.d/net.eth0"
+ 	clearconfig
+ 	addconfig 'ONBOOT="yes"'
+ 	addconfig 'NETWORKING="dhcp"'
- 	# intel framebufer quirk
+ 	# intel framebuffer quirk
- 	if [[ -e /proc/fb ]]
+ 	if [ -e ${INSTALLROOT}/etc/splash/splash.conf ]
  	then
- 		if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]
+ 		if [ -e /proc/fb ]
  		then
- 			fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')
+ 			if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]
- 			if [[ ${fbdev} != 0 ]]
  			then
- 				sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLROOT}/etc/splash/splash.conf || dialog_die
+ 				fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')
+ 				if [[ ${fbdev} != 0 ]]
+ 				then
+ 					sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLROOT}/etc/splash/splash.conf || dialog_die
+ 				fi
  			fi
  		fi
  	fi
-Line 780 
 install_system_settings()
+Line 622 
 install_system_settings()
  install_umount_rootfs()
  {
- 	cd /
+ 	is_mounted --location ${INSTALLROOT}/boot && umount ${INSTALLROOT}/boot
- 	umount ${INSTALLROOT}/boot || dialog_die
+ 	is_mounted --location ${INSTALLROOT} && umount ${INSTALLROOT}
- 	umount ${INSTALLROOT} || dialog_die
  }
  install_do_reboot()
-Line 802 
 run_install_normal()
+Line 643 
 run_install_normal()
  	dialog_setup_hdd_format
  	setup_hdd_format > /dev/null
  	install_mount_rootfs
- 	(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 | install_meter | dialog_install_system_image
  	dialog_install_settings
  	sleep 1
  	install_system_settings
- 	install_initrd_chroot
+ 	if is_initrd_supported
+ 	then
+ 		dialog_install_initrd
+ 		initrd_config
+ 		initrd_install
+ 	fi
  	dialog_install_bootsector
- 	install_bootsector_chroot
+ 	bootloader_config
+ 	bootloader_install
  	install_umount_rootfs
  	dialog_install_successful
-Line 824 
 run_install_auto()
+Line 671 
 run_install_auto()
  	dialog_setup_hdd_format
  	setup_hdd_format > /dev/null
  	install_mount_rootfs
- 	(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 | install_meter | dialog_install_system_image
  	dialog_install_settings
  	sleep 1
  	install_system_settings
- 	install_initrd_chroot
+ 	if is_initrd_supported
+ 	then
+ 		dialog_install_initrd
+ 		initrd_config
+ 		initrd_install
+ 	fi
  	dialog_install_bootsector
- 	install_bootsector_chroot
+ 	bootloader_config
+ 	bootloader_install
  	install_umount_rootfs
  	dialog_install_successful
-Line 841 
 run_install_auto()
+Line 694 
 run_install_auto()
  # set some proper traps
  trap "trap_exit" SIGINT SIGQUIT
- dialog_main
+ task_main
  exit 0

 Legend:



Removed from v.2419
 


changed lines


 
Added in v.2477
 Legend:



Removed from v.2419
 


changed lines


 
Added in v.2477
-Removed from v.2419
+Added in v.2477