--- alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in 2015/07/22 11:08:40 6799 +++ alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in 2015/07/23 09:31:04 6823 @@ -1,33 +1,25 @@ #!/bin/sh -# -# $Header: /home/cvsd/alx-cvs/alx-src/alxinstall-ng/bin/alxinstall-ng.sh,v 1.15 2008-06-28 00:37:45 niro Exp $ -# -# AutoSta_LX Installation Script -# -# Niels Rogalla -# -# -# -# Install Navigation Gui -# +# $Id$ -#images: (get ${CDIMAGENAME}) +# ignore environment! +LC_ALL=C + +MLIBDIR="/usr/lib/alxinstall-ng" + +# images: (get ${CDIMAGENAME}) source /mnt/cdrom/system/images.conf -#Includes -source /usr/lib/alxinstall-ng/functions/findhdd.sh > /dev/null -### bugfix ############################### -cdromdev="$(echo ${cdromdev} | sed 's/ //')" -######################################## +# includes +source ${MLIBDIR}/functions/hwdetection.sh ### System/Config Version -VERSION="%VERSIONTAG%" +VERSION="@@VERSION@@" TITLE="alxinstall-ng - ${VERSION}" CDPATH="/mnt/cdrom" INSTALLPATH="/mnt/magellan" -### WICHTIG: anzahl lines in der autosta_lx.tar.gz -1 +### linecount of system.tar.gz -1 ! CURRENTLINE=0 #TOTALLINES=11072 # -> now in images.conf @@ -50,7 +42,7 @@ FORMAT_FILESYSTEM="ext4" ################################################# -# DIALOG BOXEN # +# DIALOG BOXES # ################################################# die() @@ -95,7 +87,7 @@ Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81 } -dialog_setup_hdd_info_simple() +dialog_setup_hdd_info_single() { local SHDD="$(echo $HDD | sed 's/\/dev\///')" @@ -146,7 +138,7 @@ case "${i}" in "1") run_install_auto ;; "2") run_install_normal ;; - "3") run_install_simple ;; + "3") run_install_single ;; "") dialog_setup_system_menu;; esac fi @@ -164,7 +156,7 @@ hwtmp="/tmp/hwtmp.sh" fi - [[ ! -z ${installdevs} ]] && installdevs="" + run_hardware_detection_disks echo "dialog \\" > ${hwtmp} echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp} @@ -174,45 +166,32 @@ echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp} echo " Festplatten:\n \\" >> ${hwtmp} - if [[ ! -z ${scsidisks} ]] + if [[ ! -z ${ALL_DISKS} ]] then - for i in ${scsidisks} + for i in ${ALL_DISKS} do - if [[ ${i} != ${cdromdev} ]] - then - echo " \\Z7SCSI: \\Z3${i}\\Zn\n \\" >> ${hwtmp} - installdevs="${installdevs} ${i}" - fi + echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp} done fi - if [[ ! -z ${idedisks} ]] + if [[ ! -z ${ALL_CDROMS} ]] then - for i in ${idedisks} + echo " \n \\" >> ${hwtmp} + echo " CDROM Laufwerke:\n \\" >> ${hwtmp} + for i in ${ALL_CDROMS} do - if [[ ${i} != ${cdromdev} ]] - then - echo " \\Z7IDE: \\Z3${i}\\Zn\n \\" >> ${hwtmp} - installdevs="${installdevs} ${i}" - fi + echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp} done fi - if [[ ! -z ${cdromdev} ]] - then - echo " \n \\" >> ${hwtmp} - echo " \\Z7andere Laufwerke:\n \\" >> ${hwtmp} - echo " CDROM: \\Z3${cdromdev}\\Zn\n \\" >> ${hwtmp} - fi - # other devices run_hardware_detection case "${SPECIALDEVICE}" in - zotac*) echo " \n\n\n \\Z2Zotac Device erkannt.\\Zn \\" >> ${hwtmp} ;; - rangee) echo " \n\n\n \\Z2Rangee Device erkannt.\\Zn \\" >> ${hwtmp} ;; - maxdata) echo " \n\n\n \\Z2Maxdata Device erkannt.\\Zn \\" >> ${hwtmp} ;; - i845) echo " \n\n\n \\Z2Intel i845 Device erkannt.\\Zn \\" >> ${hwtmp} ;; - *) echo " \n\n\n \\ZnStandard Device erkannt.\\Zn \\" >> ${hwtmp} ;; + zotac*) echo " \n \\Z2Zotac Device erkannt.\\Zn \\" >> ${hwtmp} ;; + rangee) echo " \n \\Z2Rangee Device erkannt.\\Zn \\" >> ${hwtmp} ;; + maxdata) echo " \n \\Z2Maxdata Device erkannt.\\Zn \\" >> ${hwtmp} ;; + i845) echo " \n \\Z2Intel i845 Device erkannt.\\Zn \\" >> ${hwtmp} ;; + *) echo " \n \\ZnStandard Device erkannt.\\Zn \\" >> ${hwtmp} ;; esac if [[ ${FORMFACTOR} = laptop ]] then @@ -234,7 +213,7 @@ { local i - if [[ -z ${installdevs} ]] + if [[ -z ${ALL_DISKS} ]] then dialog \ --backtitle "${TITLE}" \ @@ -250,7 +229,7 @@ echo "--stdout \\" >> /tmp/hddtmp.sh echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh - for i in ${installdevs} + for i in ${ALL_DISKS} do echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh done @@ -268,11 +247,11 @@ fi } -dialog_setup_hdd_partitions_manuell_simple() +dialog_setup_hdd_partitions_manuell_single() { local i - if [[ -z ${installdevs} ]] + if [[ -z ${ALL_DISKS} ]] then dialog \ --backtitle "${TITLE}" \ @@ -288,7 +267,7 @@ echo "--stdout \\" >> /tmp/hddtmp.sh echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh - for i in ${installdevs} + for i in ${ALL_DISKS} do echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh done @@ -300,8 +279,8 @@ [[ ${RES} -eq 1 ]] && return 1 if [[ ${RES} -eq 0 ]] then - dialog_setup_hdd_info_simple - setup_hdd_partitions_manuell_simple + dialog_setup_hdd_info_single + setup_hdd_partitions_manuell_single fi fi } @@ -310,7 +289,7 @@ { local i - if [[ -z ${installdevs} ]] + if [[ -z ${ALL_DISKS} ]] then dialog \ --backtitle "${TITLE}" \ @@ -326,7 +305,7 @@ echo "--stdout \\" >> /tmp/hddtmp.sh echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh - for i in ${installdevs} + for i in ${ALL_DISKS} do echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh done @@ -386,7 +365,6 @@ return 0 } - dialog_install_bootsector() { dialog \ @@ -443,12 +421,11 @@ } ################################################# -# Install Komandos # +# Install Commands # ################################################# run_hardware_detection() { local hwinfo - hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)" # check for special devices/clients: @@ -520,6 +497,21 @@ fi } +run_hardware_detection_disks() +{ + 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)" +} + hdd_size_below_256mb() { local hdd="$1" @@ -610,7 +602,7 @@ cfdisk ${HDD} || die } -setup_hdd_partitions_manuell_simple() +setup_hdd_partitions_manuell_single() { ROOTHDD="${HDD}1" @@ -625,7 +617,7 @@ mke2fs -j -q ${ROOTHDD} || die } -setup_hdd_format_simple() +setup_hdd_format_single() { mke2fs -j -q ${ROOTHDD} || die } @@ -639,7 +631,7 @@ cd ${INSTALLPATH} || die } -install_mount_rootfs_simple() +install_mount_rootfs_single() { mount ${ROOTHDD} ${INSTALLPATH} || die install -d ${INSTALLPATH}/boot || die @@ -743,7 +735,7 @@ echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die fi - # bootsector schreiben chrooted schreiben (lfs/magellan) + # write bootsector chrooted (lfs/magellan) cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF /usr/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null root (hd0,0) @@ -891,9 +883,9 @@ fi } -install_system_settings_simple() +install_system_settings_single() { - # schreibe fstab + # write fstab if is_uuid_supported then echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die @@ -912,7 +904,7 @@ swapoff ${SWAPHDD} || die } -install_umount_rootfs_simple() +install_umount_rootfs_single() { cd / umount ${INSTALLPATH} || die @@ -924,7 +916,7 @@ } ################################################# -# Install Ablauf Scripte # +# Install Main Scripts # ################################################# run_install_normal() @@ -949,25 +941,25 @@ dialog_install_successful } -run_install_simple() +run_install_single() { dialog_hardware_detection - dialog_setup_hdd_partitions_manuell_simple + dialog_setup_hdd_partitions_manuell_single dialog_setup_hdd_format - setup_hdd_format_simple > /dev/null - install_mount_rootfs_simple + setup_hdd_format_single > /dev/null + install_mount_rootfs_single (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image dialog_install_settings sleep 1 - install_system_settings_simple + install_system_settings_single install_initrd_chroot dialog_install_bootsector install_bootsector_chroot - install_umount_rootfs_simple + install_umount_rootfs_single dialog_install_successful } @@ -977,19 +969,19 @@ dialog_setup_hdd_partitions_auto dialog_setup_hdd_format - setup_hdd_format_simple > /dev/null - install_mount_rootfs_simple + setup_hdd_format_single > /dev/null + install_mount_rootfs_single (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image dialog_install_settings sleep 1 - install_system_settings_simple + install_system_settings_single install_initrd_chroot dialog_install_bootsector install_bootsector_chroot - install_umount_rootfs_simple + install_umount_rootfs_single dialog_install_successful }