--- trunk/installer-simple/bin/installer.sh.in	2014/01/07 14:50:35	2443
+++ trunk/installer-simple/bin/installer.sh.in	2014/01/07 14:53:46	2444
@@ -471,8 +471,8 @@
 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
-		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}/etc/conf.d/grub"
+			clearconfig
+			addconfig "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\""
+		fi
+		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}"
@@ -516,41 +519,42 @@
 		# uuid support
 		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)
@@ -597,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