--- alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh	2005/08/17 03:35:09	280
+++ alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh	2008/06/27 22:01:08	519
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# $Header: /home/cvsd/alx-cvs/alx-src/alxinstall-ng/bin/alxinstall-ng.sh,v 1.5 2005-08-17 03:35:09 niro Exp $
+# $Header: /home/cvsd/alx-cvs/alx-src/alxinstall-ng/bin/alxinstall-ng.sh,v 1.6 2008-06-27 22:01:08 niro Exp $
 #
 # AutoSta_LX Installation Script
-# version: 0.8b
+# version: 0.9
 #
 # Niels Rogalla <niro@magellan-linux.de>
 #		<rogalla@augusta-bochum.de>
@@ -12,11 +12,6 @@
 # Install Navigation Gui
 #
 
-#source /etc/alx_version
-#source /opt/alx-config/version
-
-#source /etc/alx-config/config.rc
-
 #images: (get ${CDIMAGENAME})
 source /mnt/cdrom/system/images.conf
 
@@ -45,10 +40,6 @@
 #################################################
 
 die() {
-	#clear
-	#echo -e "\nhuch, da ist ein script gestorben -> $?\n"
-	#read
-	#exit 0
 	ERROR=$1
 	RETVAL=$?
 	dialog_install_failure
@@ -379,10 +370,6 @@
 		if [ "$RES" == "0" ];then
 			case "$METHOD" in
         			"1")	
-					#only for now later it will be used again
-					#with 6.1-r2 only one install method available
-					#dialog_install_method
-					#run_install_normal
 					dialog_setup_system_menu
 					;;
 				"2") 	dialog_setup_hdd_found_manuell
@@ -431,8 +418,6 @@
 }
 
 setup_hdd_format_flash() {
-#	mkswap $SWAPHDD || die
-#	mke2fs -j -q $BOOTHDD || die
 	mke2fs -j -q $ROOTHDD || die
 }
 
@@ -445,15 +430,12 @@
 }
 
 install_mount_rootfs_flash() {
-#	swapon $SWAPHDD || die
 	mount $ROOTHDD $INSTALLPATH || die
 	install -d $INSTALLPATH/boot || die
-#	mount $BOOTHDD $INSTALLPATH/boot || die
 	cd $INSTALLPATH || die
 }
 
 install_system_image() {
-	#tar xvzpf $CDPATH/system/autosta_lx.tar.gz
 	tar xvjpf ${CDPATH}/system/${CDIMAGENAME} -C ${INSTALLPATH}
 }
 
@@ -462,8 +444,6 @@
 	declare -i CPUTYPE=`cat /proc/cpuinfo |grep "cpu family"|cut -d ' ' -f3`
 
 	if [ $CPUTYPE -le 5 ];then
-                #echo -e "\033[1;6m\033[36m""i386 Architektur gefunden.""\033[0m"
-                #echo -e "Installiere i386 Kernel..."
 
 		lastdir="`pwd`"
 
@@ -480,8 +460,6 @@
 		cd $lastdir || die
 
         elif [ $CPUTYPE -ge 6 ];then
-                #echo -e "\033[1;6m\033[36m""i686 Architektur gefunden.""\033[0m"
-                #echo -e "Installiere i686 Kernel..."
 
 		lastdir="`pwd`"
 
@@ -520,21 +498,12 @@
 
 	echo -e "default 0" > $INSTALLPATH/boot/grub/grub.conf || die
 	echo -e "timeout 03" >> $INSTALLPATH/boot/grub/grub.conf ||die
-	#no support for splash image in 6.1-r2
-	#echo -e "splashimage=(hd0,0)/boot/grub/splash.xpm.gz" >> $INSTALLPATH/boot/grub/grub.conf || die
 	echo -e "\ntitle=${KRNVER}" >> $INSTALLPATH/boot/grub/grub.conf || die
 	echo -e "root (hd0,0)" >> $INSTALLPATH/boot/grub/grub.conf || die
-	
-	#s3 cards don't support this
-	#echo -e "kernel (hd0,0)/boot/${KRNIMG} root=$ROOTHDD vga=0x317 video:vesa:ywrap,mtrr splash=silent quiet" >> $INSTALLPATH/boot/grub/grub.conf || die
-	#that's more safer:
+
 	echo -e "kernel (hd0,0)/boot/${KRNIMG} root=$ROOTHDD quiet" >> $INSTALLPATH/boot/grub/grub.conf || die
-	
-	#not needed without bootsplash support
-	#echo -e "initrd=/boot/${KRNINITRD}" >> $INSTALLPATH/boot/grub/grub.conf || die
 
 	### bootsector schreiben
-	#grub --no-floppy < $CONFIGS_TEMPLATE/grubsettings || die
 	/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null || die
 root (hd0,0)
 setup (hd0)
@@ -544,7 +513,6 @@
 
 install_bootsector_chroot() {
 	### grubconf schreiben
-	#source $INSTALLPATH/INSTALL/kernel/kernelversion
 	source $INSTALLPATH/boot/kernelversion
 
 	#for alx only
@@ -574,21 +542,11 @@
 	echo -e "default 0" > $INSTALLPATH/boot/grub/grub.conf || die
 	echo -e "timeout 0" >> $INSTALLPATH/boot/grub/grub.conf ||die
 	
-	#no support for splash image in 6.1-r2
-	#echo -e "splashimage=(hd0,0)/boot/grub/splash.xpm.gz" >> $INSTALLPATH/boot/grub/grub.conf || die
-	
 	echo -e "\ntitle=${KRNVER}" >> $INSTALLPATH/boot/grub/grub.conf || die
 	echo -e "root (hd0,0)" >> $INSTALLPATH/boot/grub/grub.conf || die
 	
-	#s3 cards don't support this
-	#echo -e "kernel (hd0,0)/boot/${KRNIMG} root=$ROOTHDD vga=0x317 video:vesa:ywrap,mtrr splash=silent quiet" >> $INSTALLPATH/boot/grub/grub.conf || die
-	#that's more safer:
 	echo -e "kernel (hd0,0)/boot/${KRNIMG} root=$ROOTHDD quiet" >> $INSTALLPATH/boot/grub/grub.conf || die
 	
-	#not needed without bootsplash support
-	#echo -e "initrd=/boot/${KRNINITRD}" >> $INSTALLPATH/boot/grub/grub.conf || die
-
-
 	### bootsector schreiben chrooted schreiben (gentoo)
 	if [ -f $INSTALLPATH/sbin/grub ]
 	then
@@ -617,8 +575,6 @@
 
 	##enters chroot
 	mount -t proc none $INSTALLPATH/proc
-	# bind /dev to get the devices right,
-	# if bootet from a 2.6 kernel with udev
 	mount -o bind /dev $INSTALLPATH/dev
 	chroot $INSTALLPATH /bin/bash --rcfile /root/.bashrc -i
 	umount $INSTALLPATH/proc
@@ -647,23 +603,15 @@
 	echo -e "$SWAPHDD\tswap\tswap\tpri=1\t0 0" >> $INSTALLPATH/etc/fstab || die
 	echo -e "none\t/proc\tproc\tdefaults\t0 0" >> $INSTALLPATH/etc/fstab || die
 	
-	#deprecated
-	#echo -e "devpts\t/dev/pts\tdevpts\tgid=4,mode=620\t0 0" >> $INSTALLPATH/etc/fstab || die
-
 	echo -e "none\t/dev/shm\ttmpfs\tdefaults\t0 0" >> $INSTALLPATH/etc/fstab || die
 	echo -e "none\t/proc/bus/usb\tusbfs\tdefaults\t0 0" >> $INSTALLPATH/etc/fstab || die
 }
 
 install_system_settings_flash(){
 	### schreibe fstab
-#	echo -e "$BOOTHDD\t/boot\text3\tnoatime,noauto\t1 1" > $INSTALLPATH/etc/fstab || die
 	echo -e "$ROOTHDD\t/\text3\tnoatime\t0 0" > $INSTALLPATH/etc/fstab || die
-#	echo -e "$SWAPHDD\tswap\tswap\tpri=1\t0 0" >> $INSTALLPATH/etc/fstab || die
 	echo -e "none\t/proc\tproc\tdefaults\t0 0" >> $INSTALLPATH/etc/fstab || die
 	
-	#deprecated
-	#echo -e "devpts\t/dev/pts\tdevpts\tgid=4,mode=620\t0 0" >> $INSTALLPATH/etc/fstab || die
-
 	echo -e "none\t/dev/shm\ttmpfs\tdefaults\t0 0" >> $INSTALLPATH/etc/fstab || die
 	echo -e "none\t/proc/bus/usb\tusbfs\tdefaults\t0 0" >> $INSTALLPATH/etc/fstab || die
 }
@@ -685,20 +633,11 @@
 
 install_umount_rootfs_flash() {
 	cd /
-#	umount $INSTALLPATH/boot || die
 	umount $INSTALLPATH || die
-#	swapoff $SWAPHDD || die
 }
 
 install_do_reboot() {
 
-	#only for now later it will be used again
-	#with 6.1-r2 these options are not available
-	#cd /
-	#umount $CDPATH
-	#eject
-	#clear
-	
 	reboot
 }
 
@@ -707,9 +646,6 @@
 #################################################
 
 run_install_normal() {
-	#only for now later it will be used again
-	#with 6.1-r2 only one install method available
-	#dialog_setup_hdd_menu
 	dialog_setup_hdd_found_manuell
 	
 	dialog_setup_hdd_partitions_manuell
@@ -718,20 +654,9 @@
 	install_mount_rootfs
 	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
 	
-	#only for now later it will be used again
-	#with 6.1-r2 variable kernels are not available
-	#dialog_install_kernel_image
-	#install_kernel_image
-	
 	dialog_install_bootsector
 	install_bootsector_chroot
-	
-	#only for now later it will be used again
-	#with 6.1-r2 highest version of alx-config is already included
-	#dialog_install_alxconfig
-	#sleep 1
-	#install_alxconfig
-	
+
 	dialog_install_settings
 	sleep 1
 	install_system_settings
@@ -741,9 +666,6 @@
 }
 
 run_install_flash() {
-	#only for now later it will be used again
-	#with 6.1-r2 only one install method available
-	#dialog_setup_hdd_menu
 	dialog_setup_hdd_found_manuell
 	
 	dialog_setup_hdd_partitions_manuell_flash
@@ -752,20 +674,10 @@
 	install_mount_rootfs_flash
 	(install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
 	
-	#only for now later it will be used again
-	#with 6.1-r2 variable kernels are not available
-	#dialog_install_kernel_image
-	#install_kernel_image
 	
 	dialog_install_bootsector
 	install_bootsector_chroot
 	
-	#only for now later it will be used again
-	#with 6.1-r2 highest version of alx-config is already included
-	#dialog_install_alxconfig
-	#sleep 1
-	#install_alxconfig
-	
 	dialog_install_settings
 	sleep 1
 	install_system_settings_flash