--- alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh 2005/04/19 17:24:57 268 +++ alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh 2005/08/17 03:35:09 280 @@ -1,6 +1,6 @@ #!/bin/sh # -# $Header: /home/cvsd/alx-cvs/alx-src/alxinstall-ng/bin/alxinstall-ng.sh,v 1.4 2005-04-19 17:24:57 niro Exp $ +# $Header: /home/cvsd/alx-cvs/alx-src/alxinstall-ng/bin/alxinstall-ng.sh,v 1.5 2005-08-17 03:35:09 niro Exp $ # # AutoSta_LX Installation Script # version: 0.8b @@ -27,7 +27,7 @@ ######################################## ### System/Config Version -VERSION="0.1" +VERSION="0.2" TITLE="alxinstall-ng - ${VERSION}" #CONFIGS_TEMPLATE="/opt/alx-config/configs" @@ -87,7 +87,20 @@ Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81 } -dialog_setup_hdd_menu() { +dialog_setup_hdd_info_flash(){ + local SHDD="`echo $HDD|sed -e 's/\/dev\///'`" + + dialog \ + --colors \ + --title "[ Festplatten Partitionierung ]" \ + --backtitle "$TITLE" \ + --ok-label "Weiter" \ + --msgbox "\nBitte legen Sie 1 Partition an.\n\n\ + [ \Z3${SHDD}1\Zn ] Typ: \Z3Linux\Zn mit dem gesamten Speicher\n\ + Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81 +} + +dialog_setup_system_menu() { I=`dialog \ --backtitle "$TITLE" \ @@ -95,9 +108,9 @@ --cancel-label "Abbrechen" \ --ok-label "Weiter" \ --stdout \ - --menu "\nWaehlen Sie zwischen Manuell und Automatisch" 14 70 5 \ - "1" "Manuell" \ - "2" "Automatisch"` + --menu "\nWaehlen Sie die Installations-Methode" 14 70 5 \ + "1" "Normale IDE-Disk" \ + "2" "Flash-Speicher"` RES=$? if [ "$RES" == "1" ];then return 1 @@ -105,12 +118,11 @@ if [ "$RES" == "0" ];then case "$I" in "1") - dialog_setup_hdd_found_manuell + run_install_normal ;; "2") - dialog_warning - setup_hdd_partitions_silent - ;; + run_install_flash + ;; esac fi } @@ -202,6 +214,44 @@ fi } +dialog_setup_hdd_partitions_manuell_flash() { + if [ -z "$installdevs" ] + then + dialog \ + --backtitle "$TITLE" \ + --ok-label "Beenden" \ + --msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70 + exit 1 + else + + echo "dialog \\" > /tmp/hddtmp.sh + echo "--backtitle \"$TITLE\" \\" >> /tmp/hddtmp.sh + echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh + echo "--cancel-label \"Beenden\" \\" >> /tmp/hddtmp.sh + echo "--stdout \\" >> /tmp/hddtmp.sh + echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh + + for I in $installdevs + do + echo "\"$I\" \"\" \\" >> /tmp/hddtmp.sh + done + echo -e "\n" >> /tmp/hddtmp.sh + + chmod a+x /tmp/hddtmp.sh + HDD="`/tmp/hddtmp.sh`" + RES=$? + if [ "$RES" == "1" ] + then + return 1 + fi + if [ "$RES" == "0" ] + then + dialog_setup_hdd_info_flash + setup_hdd_partitions_manuell_flash + fi + fi +} + dialog_setup_hdd_partitions_silent() { dialog \ --backtitle "$TITLE" \ @@ -332,7 +382,8 @@ #only for now later it will be used again #with 6.1-r2 only one install method available #dialog_install_method - run_install_normal + #run_install_normal + dialog_setup_system_menu ;; "2") dialog_setup_hdd_found_manuell ;; @@ -357,6 +408,13 @@ cfdisk $HDD || die } +setup_hdd_partitions_manuell_flash() { + ROOTHDD="${HDD}1" + + ## hdds partitionieren manuell + cfdisk $HDD || die +} + setup_hdd_partitions_silent() { ## hdds löschen dd if=/dev/zero of=$HDD bs=1024k count=1 || die @@ -372,6 +430,12 @@ mke2fs -j -q $ROOTHDD || die } +setup_hdd_format_flash() { +# mkswap $SWAPHDD || die +# mke2fs -j -q $BOOTHDD || die + mke2fs -j -q $ROOTHDD || die +} + install_mount_rootfs() { swapon $SWAPHDD || die mount $ROOTHDD $INSTALLPATH || die @@ -380,6 +444,14 @@ cd $INSTALLPATH || die } +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} @@ -582,6 +654,19 @@ 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 +} install_hotfixes(){ if [ -f $CDPATH/hotfixes/hotfixes.sh ] then @@ -598,6 +683,13 @@ swapoff $SWAPHDD || die } +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 @@ -648,6 +740,40 @@ dialog_install_successful } +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 + dialog_setup_hdd_format + setup_hdd_format_flash > /dev/null + 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 + install_hotfixes + install_umount_rootfs_flash + dialog_install_successful +} + run_install_silent() { echo "starting silent install ..." sleep 1