--- alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh	2008/06/27 22:32:52	521
+++ alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh	2008/06/27 22:43:02	522
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Header: /home/cvsd/alx-cvs/alx-src/alxinstall-ng/bin/alxinstall-ng.sh,v 1.7 2008-06-27 22:27:46 niro Exp $
+# $Header: /home/cvsd/alx-cvs/alx-src/alxinstall-ng/bin/alxinstall-ng.sh,v 1.8 2008-06-27 22:43:02 niro Exp $
 #
 # AutoSta_LX Installation Script
 #
@@ -243,13 +243,6 @@
 	fi
 }
 
-dialog_setup_hdd_partitions_silent()
-{
-	dialog \
-	--backtitle "${TITLE}" \
-	--infobox "Erstelle Partitionen ..." 3 70
-}
-
 dialog_setup_hdd_format()
 {
 	dialog \
@@ -292,29 +285,6 @@
 	--infobox "Schreibe den Bootsektor ..." 3 70
 }
 
-dialog_install_alxconfig()
-{
-	dialog \
-	--backtitle "${TITLE}" \
-	--infobox "Installiere die ALX Setup-Tools ..." 3 70
-}
-
-dialog_install_kernel_image()
-{
-	dialog \
-	--backtitle "${TITLE}" \
-	--infobox "Installiere den System-Kernel ..." 3 70
-
-}
-
-dialog_install_hotfixes()
-{
-	dialog \
-	--backtitle "${TITLE}" \
-	--infobox "Installiere Hotfixes ..." 3 70
-
-}
-
 dialog_install_successful()
 {
 	dialog \
@@ -333,28 +303,6 @@
 	" 10 81
 }
 
-dialog_install_method()
-{
-
-	METHOD=$(dialog \
-	--backtitle "${TITLE}" \
-	--cancel-label "Abbrechen" \
-	--ok-label "Weiter" \
-	--stdout \
-	--menu "Konfiguration" 14 70 5 \
-	"1" "Normale Installation" \
-	"2" "Silent Installation")
-	RES=$?
-	[[ ${RES} -eq 1 ]] && return 1
-	if [[ ${RES} -eq 0 ]]
-	then
-		case ${METHOD} in
-        		"1") run_install_normal ;;
-			"2") dialog_warning ; run_install_silent ;;
-		esac
-	fi
-}
-
 dialog_main()
 {
 	METHOD=0
@@ -406,16 +354,6 @@
 	cfdisk ${HDD} || die
 }
 
-setup_hdd_partitions_silent()
-{
-	## hdds löschen
-	dd if=/dev/zero of=${HDD} bs=1024k count=1 || die
-	## hdds partitionieren silent
-	fdisk ${HDD} < ${CONFIGS_TEMPLATE}/fdisksettings
-	
-	read
-}
-
 setup_hdd_format()
 {
 	mkswap ${SWAPHDD} || die
@@ -449,70 +387,6 @@
 	tar xvjpf ${CDPATH}/system/${CDIMAGENAME} -C ${INSTALLPATH}
 }
 
-
-install_kernel_image()
-{
-	declare -i CPUTYPE=$(cat /proc/cpuinfo | grep "cpu family" | cut -d ' ' -f3)
-
-	if [[ ${CPUTYPE} -le 5 ]]
-	then
-		lastdir="$(pwd)"
-
-		mkdir -p ${INSTALLPATH}/INSTALL/kernel || die
-		cd ${INSTALLPATH}/INSTALL/kernel || die
-		tar xzpf ${CDPATH}/kernels/kernel-i386.tar.gz || die
-		source ${INSTALLPATH}/INSTALL/kernel/kernelversion || die
-
-		cp -aRf ${INSTALLPATH}/INSTALL/kernel/${KRNLIB} ${INSTALLPATH}/lib/modules || die
-		cp -aRf ${INSTALLPATH}/INSTALL/kernel/${KRNIMG} ${INSTALLPATH}/boot || die
-		cp -aRf ${INSTALLPATH}/INSTALL/kernel/${KRNINITRD} ${INSTALLPATH}/boot || die
-		cp -aRf ${INSTALLPATH}/INSTALL/kernel/kernelversion ${INSTALLPATH}/boot || die
-
-		cd ${lastdir} || die
-
-        elif [[ ${CPUTYPE} -ge 6 ]]
-	then
-		lastdir="$(pwd)"
-
-		mkdir -p ${INSTALLPATH}/INSTALL/kernel || die
-		cd ${INSTALLPATH}/INSTALL/kernel || die
-		tar xzpf ${CDPATH}/kernels/kernel-i686.tar.gz || die
-		source ${INSTALLPATH}/INSTALL/kernel/kernelversion || die
-
-		cp -aRf ${INSTALLPATH}/INSTALL/kernel/${KRNLIB} ${INSTALLPATH}/lib/modules || die
-		cp -aRf ${INSTALLPATH}/INSTALL/kernel/${KRNIMG} ${INSTALLPATH}/boot || die
-		cp -aRf ${INSTALLPATH}/INSTALL/kernel/${KRNINITRD} ${INSTALLPATH}/boot || die
-		cp -aRf ${INSTALLPATH}/INSTALL/kernel/kernelversion ${INSTALLPATH}/boot || die
-
-		cd ${lastdir} || die
-        fi
-}
-
-install_bootsector()
-{
-	### grubconf schreiben
-	source ${INSTALLPATH}/INSTALL/kernel/kernelversion
-
-	[[ -z ${KRNVER} ]] && KRNVER="AutoSta_LX"
-	[[ -z ${KRNIMG} ]] && KRNIMG="bzImage"
-	[[ -z ${KRNINITRD} ]] && KRNINITRD="initrd"
-
-
-	echo -e "default 0" > ${INSTALLPATH}/boot/grub/grub.conf || die
-	echo -e "timeout 03" >> ${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
-
-	echo -e "kernel (hd0,0)/boot/${KRNIMG} root=${ROOTHDD} quiet" >> ${INSTALLPATH}/boot/grub/grub.conf || die
-
-	### bootsector schreiben
-	/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null || die
-root (hd0,0)
-setup (hd0)
-quit
-EOF
-}
-
 install_bootsector_chroot()
 {
 	### grubconf schreiben
@@ -526,36 +400,21 @@
 		KRNVER="ALX-${ALXVER}"
 		ALXVER="${OLD_ALXVER}"
 	fi
-	
+
 	[[ -z ${KRNVER} ]] && KRNVER="AutoSta_LX"
-	[[ -z ${KRNIMG} ]] && KRNIMG="bzImage"
 	[[ -z ${KRNINITRD} ]] && KRNINITRD="initrd"
 
-	echo -e "default 0" > ${INSTALLPATH}/boot/grub/grub.conf || die
-	echo -e "timeout 0" >> ${INSTALLPATH}/boot/grub/grub.conf ||die
-	
+	echo "default 0" > ${INSTALLPATH}/boot/grub/grub.conf || die
+	echo "timeout 0" >> ${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
+	echo "root (hd0,0)" >> ${INSTALLPATH}/boot/grub/grub.conf || die
 	
-	echo -e "kernel (hd0,0)/boot/${KRNIMG} root=${ROOTHDD} quiet" >> ${INSTALLPATH}/boot/grub/grub.conf || die
+	echo "kernel /boot/vmlinuz root=${ROOTHDD} quiet" >> ${INSTALLPATH}/boot/grub/grub.conf || die
+	echo "initrd /boot/initrd" >> ${INSTALLPATH}/boot/grub/grub.conf || die
 	
-	### bootsector schreiben chrooted schreiben (gentoo)
-	if [ -f ${INSTALLPATH}/sbin/grub ]
-	then
-		cat > ${INSTALLPATH}/root/.bashrc << CHROOTEOF
-/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null
-root (hd0,0)
-setup (hd0)
-quit
-EOF
-exit 0
-CHROOTEOF
-	fi
-
-	### bootsector schreiben chrooted schreiben (lfs/magellan)
-	if [ -f ${INSTALLPATH}/usr/sbin/grub ]
-	then
-		cat > ${INSTALLPATH}/root/.bashrc << CHROOTEOF
+	# bootsector schreiben chrooted schreiben (lfs/magellan)
+	cat > ${INSTALLPATH}/root/.bashrc << CHROOTEOF
 /usr/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null
 root (hd0,0)
 setup (hd0)
@@ -563,62 +422,34 @@
 EOF
 exit 0
 CHROOTEOF
-	fi
 
-	##enters chroot
-	mount -t proc none ${INSTALLPATH}/proc
+	## enters chroot
+	mount -t proc proc ${INSTALLPATH}/proc
+	mount -t sysfs sysfs ${INSTALLPATH}/sysfs
 	mount -o bind /dev ${INSTALLPATH}/dev
 	chroot ${INSTALLPATH} /bin/bash --rcfile /root/.bashrc -i
 	umount ${INSTALLPATH}/proc
+	umount ${INSTALLPATH}/sys
 	umount ${INSTALLPATH}/dev
 	rm ${INSTALLPATH}/root/.bashrc
 }
 
-install_alxconfig()
-{
-	lastdir="$(pwd)"
-
-	mkdir -p ${INSTALLPATH}/opt/alx-config || die
-	cd ${INSTALLPATH}/opt/alx-config || die
-	tar xzpf ${CDPATH}/alx-config/alx-config.tar.gz || die
-	chmod a+x ${INSTALLPATH}/opt/alx-config/Configurator/config_functions.sh || die
-	chmod a+x ${INSTALLPATH}/opt/alx-config/Configurator/config_menu.sh || die
-	ln -sf /opt/alx-config/Configurator/config_menu.sh ${INSTALLPATH}/bin/ALXConfig || die
-
-	cd ${lastdir} || die
-}
-
-
 install_system_settings()
 {
-	### schreibe fstab
+	# 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
-
-	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
+	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_system_settings_flash()
 {
-	### schreibe fstab
+	# schreibe fstab
 	echo -e "${ROOTHDD}\t/\text3\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die
-	echo -e "none\t/proc\tproc\tdefaults\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_hotfixes()
-{
-	if [ -f ${CDPATH}/hotfixes/hotfixes.sh ]
-	then
-		dialog_hotfixes
-		sleep1
-		${CDPATH}/hotfixes/hotfixes.sh
-	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()
@@ -660,7 +491,6 @@
 	dialog_install_settings
 	sleep 1
 	install_system_settings
-	install_hotfixes
 	install_umount_rootfs
 	dialog_install_successful
 }
@@ -681,28 +511,10 @@
 	dialog_install_settings
 	sleep 1
 	install_system_settings_flash
-	install_hotfixes
 	install_umount_rootfs_flash
 	dialog_install_successful
 }
 
-run_install_silent()
-{
-	echo "starting silent install ..."
-	sleep 1
-}
-
-run_install_unattended()
-{
-	echo "starting unattended install ..."
-	sleep 1
-}
-
-if [[ $1 = unattended ]]
-then
-	run_install_unattended
-else
-	dialog_main
-fi
+dialog_main
 
 exit 0