--- trunk/installer-simple/bin/installer.sh.in	2014/01/07 14:25:34	2436
+++ trunk/installer-simple/bin/installer.sh.in	2014/01/07 14:56:12	2446
@@ -438,8 +438,8 @@
 setup_hdd_partitions_manual()
 {
 	ROOTHDD="${HDD}1"
-
-	## hdds partitionieren manual
+	SWAPHDD=""
+	BOOTHDD=""
 	cfdisk ${HDD} || dialog_die
 }
 
@@ -468,11 +468,11 @@
 	popd > /dev/null
 }
 
-install_bootsector_chroot()
+disabled_install_bootsector_chroot()
 {
 	local my_roothdd
-	local grubconf=${INSTALLROOT}/boot/grub/grub.conf
-	local grub2conf=/boot/grub/grub.cfg
+	local grubconf="${INSTALLROOT}/boot/grub/grub.conf"
+	local grub2conf="/boot/grub/grub.cfg"
 
 	# check for grub2
 	if [[ -f ${INSTALLROOT}/sbin/grub-mkconfig ]]
@@ -488,19 +488,22 @@
 		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"
+			clearconfig
+			addconfig "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\""
 		fi
-		echo 'grub-mkdevicemap' > ${INSTALLROOT}/root/.installrc || dialog_die
-		echo "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null" >> ${INSTALLROOT}/root/.installrc || dialog_die
-		echo "grub-install --no-floppy ${HDD} &> /dev/null" >> ${INSTALLROOT}/root/.installrc || dialog_die
-		echo "exit 0" >> ${INSTALLROOT}/root/.installrc || dialog_die
+		CONFIG="${INSTALLROOT}/root/.installrc"
+		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}"
@@ -514,48 +517,44 @@
 		[[ -z ${KRNIMG} ]] && KRNIMG="vmlinuz"
 
 		# uuid support
-		if is_uuid_supported
-		then
-			my_roothdd="UUID=$(get_uuid ${ROOTHDD})"
-		else
-			my_roothdd="${ROOTHDD}"
-		fi
+		my_roothdd="UUID=$(get_uuid ${ROOTHDD})"
 
-		: > ${grubconf} || dialog_die
-		echo "default 0" >> ${grubconf} || dialog_die
-		echo "timeout 3" >> ${grubconf} || dialog_die
+		CONFIG="${grubconf}"
+		clearconfig
+		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
-		echo "# normal boot" >> ${grubconf} || dialog_die
-		echo "title ${KRNVER}" >> ${grubconf} || dialog_die
-		echo "root (hd0,0)" >> ${grubconf} || dialog_die
-		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}" >> ${grubconf} || dialog_die
+		addconfig
+		addconfig "# normal boot"
+		addconfig "title ${KRNVER}"
+		addconfig "root (hd0,0)"
+		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
-		echo "# admin boot" >> ${grubconf} || dialog_die
-		echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || dialog_die
-		echo "lock"  >> ${grubconf} || dialog_die
-		echo "root (hd0,0)" >> ${grubconf} || dialog_die
-		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} hardware-auto-detection" >> ${grubconf} || dialog_die
+		addconfig
+		addconfig "# admin boot"
+		addconfig "title ${KRNVER} - Re-run hardware-detection"
+		addconfig "lock"
+		addconfig "root (hd0,0)"
+		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
-		echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || dialog_die
-		echo "lock"  >> ${grubconf} || dialog_die
-		echo "root (hd0,0)" >> ${grubconf} || dialog_die
-		echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} alx-reset-settings" >> ${grubconf} || dialog_die
+		addconfig
+		addconfig "title ${KRNVER} - Reset *all* local settings"
+		addconfig "lock"
+		addconfig "root (hd0,0)"
+		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)
@@ -574,14 +573,7 @@
 	rm ${INSTALLROOT}/root/.installrc
 }
 
-is_initrd_supported()
-{
-	# only generate initrds if the cmd exists
-	[[ -x ${INSTALLROOT}/sbin/mkinitrd ]] && return 0
-	return 1
-}
-
-install_initrd_chroot()
+disabled_install_initrd_chroot()
 {
 	# only generate initrds if the cmd exists
 	is_initrd_supported || return 0
@@ -609,13 +601,19 @@
 
 	# 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
@@ -628,65 +626,35 @@
 	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
-	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
-	# 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" >> ${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
+	local CONFIG
+
+	# write fstab
+	CONFIG="${INSTALLROOT}/etc/fstab"
+	clearconfig
+	addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1"
+	addconfig -e "proc\t/proc\tproc\tdefaults\t0 0"
+	addconfig -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0"
 
 	# 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
-	if [[ -e /proc/fb ]]
+	# intel framebuffer quirk
+	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 [[ ${fbdev} != 0 ]]
+			if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]
 			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
@@ -720,11 +688,16 @@
 	dialog_install_settings
 	sleep 1
 	install_system_settings
-	dialog_install_initrd	
-	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
@@ -743,11 +716,16 @@
 	dialog_install_settings
 	sleep 1
 	install_system_settings
-	dialog_install_initrd	
-	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