Magellan Linux

  • Back to homepage
    • /[alx-svn]/alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in

    Diff of /alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh revision 1180 by niro, Wed Aug 5 18:12:25 2009 UTC alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in revision 2573 by niro, Mon Jul 4 21:24:46 2011 UTC
    # Line 21  cdromdev="$(echo ${cdromdev} | sed 's/ / Line 21  cdromdev="$(echo ${cdromdev} | sed 's/ /
    21  ########################################  ########################################
    22    
    23  ### System/Config Version  ### System/Config Version
    24  VERSION="0.3.3"  VERSION="%VERSIONTAG%"
    25  TITLE="alxinstall-ng - ${VERSION}"  TITLE="alxinstall-ng - ${VERSION}"
    26    
    27  CDPATH="/mnt/cdrom"  CDPATH="/mnt/cdrom"
    # Line 31  INSTALLPATH="/mnt/magellan" Line 31  INSTALLPATH="/mnt/magellan"
    31  CURRENTLINE=0  CURRENTLINE=0
    32  #TOTALLINES=11072 # -> now in images.conf  #TOTALLINES=11072 # -> now in images.conf
    33    
    34    # standard kernel opts
    35    KERNELOPTS="quiet video=1024x768"
    36    
    37    # default specialdevices
    38    SPECIALDEVICE=""
    39    
    40    # target filesystem
    41    FORMAT_FILESYSTEM="ext4"
    42    
    43  #################################################  #################################################
    44  #  DIALOG BOXEN #  #  DIALOG BOXEN #
    # Line 92  dialog_setup_hdd_info_flash() Line 100  dialog_setup_hdd_info_flash()
    100   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
    101  }  }
    102    
    103    dialog_setup_hdd_info_auto()
    104    {
    105     local SHDD="$(echo $HDD | sed 's/\/dev\///')"
    106    
    107     dialog \
    108     --colors \
    109     --title "[ Festplatten Partitionierung ]" \
    110     --backtitle "${TITLE}" \
    111     --ok-label "Weiter" \
    112     --msgbox "\nAchtung!\n\
    113     Alle Daten werden von der Disk [ \Z3${HDD}\Zn ] gelöscht!" 12 81
    114    }
    115    
    116  dialog_setup_system_menu()  dialog_setup_system_menu()
    117  {  {
    118   local i   local i
    # Line 102  dialog_setup_system_menu() Line 123  dialog_setup_system_menu()
    123   --cancel-label "Abbrechen" \   --cancel-label "Abbrechen" \
    124   --ok-label "Weiter" \   --ok-label "Weiter" \
    125   --stdout \   --stdout \
    126     --colors \
    127   --menu "\nWaehlen Sie die Installations-Methode" 14 70 5 \   --menu "\nWaehlen Sie die Installations-Methode" 14 70 5 \
    128   "1" "Normale IDE-Disk" \   "1" "Automatisches Setup (Empfohlen)" \
    129   "2" "Flash-Speicher")   "" "" \
    130     "" "\Z1Experten Modi:\Zn" \
    131     "2" "Normale IDE-Disk (Manuell)" \
    132     "3" "Flash-Speicher (Manuell)")
    133   RES=$?   RES=$?
    134   [[ ${RES} -eq 1 ]] && return 1   [[ ${RES} -eq 1 ]] && return 1
    135   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
    136   then   then
    137   case "${i}" in   case "${i}" in
    138           "1") run_install_normal ;;   "1") run_install_auto ;;
    139   "2") run_install_flash ;;           "2") run_install_normal ;;
    140     "3") run_install_flash ;;
    141     "") dialog_setup_system_menu;;
    142   esac   esac
    143   fi   fi
    144  }  }
    145    
    146  dialog_setup_hdd_found_manuell()  dialog_hardware_detection()
    147  {  {
    148   local i   local i
    149     local hwtmp
    150    
    151     if [ -x $(which mktemp &> /dev/null) ]
    152     then
    153     hwtmp="$(mktemp)"
    154     else
    155     hwtmp="/tmp/hwtmp.sh"
    156     fi
    157    
    158   [[ ! -z ${installdevs} ]] && installdevs=""   [[ ! -z ${installdevs} ]] && installdevs=""
    159    
    160   echo "dialog \\"  > /tmp/hddtmp.sh   echo "dialog \\"  > ${hwtmp}
    161   echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh   echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}
    162   echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh   echo "--ok-label \"Weiter\" \\" >> ${hwtmp}
    163   echo "--stdout \\" >> /tmp/hddtmp.sh   echo "--stdout \\" >> ${hwtmp}
    164   echo "--colors \\" >> /tmp/hddtmp.sh   echo "--colors \\" >> ${hwtmp}
    165   echo "--msgbox \"Gefundene Hardware:\n\n \\" >> /tmp/hddtmp.sh   echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}
    166   echo " Festplatten:\n \\" >> /tmp/hddtmp.sh   echo " Festplatten:\n \\" >> ${hwtmp}
    167    
    168   if [[ ! -z ${scsidisks} ]]   if [[ ! -z ${scsidisks} ]]
    169   then   then
    # Line 136  dialog_setup_hdd_found_manuell() Line 171  dialog_setup_hdd_found_manuell()
    171   do   do
    172   if [[ ${i} != ${cdromdev} ]]   if [[ ${i} != ${cdromdev} ]]
    173   then   then
    174   echo " \\Z7SCSI: \\Z3${i}\\Zn\n \\" >> /tmp/hddtmp.sh   echo " \\Z7SCSI: \\Z3${i}\\Zn\n \\" >> ${hwtmp}
    175   installdevs="${installdevs} ${i}"   installdevs="${installdevs} ${i}"
    176   fi   fi
    177   done   done
    # Line 148  dialog_setup_hdd_found_manuell() Line 183  dialog_setup_hdd_found_manuell()
    183   do   do
    184   if [[ ${i} != ${cdromdev} ]]   if [[ ${i} != ${cdromdev} ]]
    185   then   then
    186   echo " \\Z7IDE:  \\Z3${i}\\Zn\n \\" >> /tmp/hddtmp.sh   echo " \\Z7IDE:  \\Z3${i}\\Zn\n \\" >> ${hwtmp}
    187   installdevs="${installdevs} ${i}"   installdevs="${installdevs} ${i}"
    188   fi   fi
    189   done   done
    # Line 156  dialog_setup_hdd_found_manuell() Line 191  dialog_setup_hdd_found_manuell()
    191    
    192   if [[ ! -z ${cdromdev} ]]   if [[ ! -z ${cdromdev} ]]
    193   then   then
    194   echo " \n \\" >> /tmp/hddtmp.sh   echo " \n \\" >> ${hwtmp}
    195   echo " \\Z7andere Laufwerke:\n \\" >> /tmp/hddtmp.sh   echo " \\Z7andere Laufwerke:\n \\" >> ${hwtmp}
    196   echo " CDROM: \\Z3${cdromdev}\\Zn\n \\" >> /tmp/hddtmp.sh   echo " CDROM: \\Z3${cdromdev}\\Zn\n \\" >> ${hwtmp}
    197   fi   fi
    198   echo " \" 13 70" >> /tmp/hddtmp.sh  
    199   chmod a+x /tmp/hddtmp.sh   # other devices
    200   /tmp/hddtmp.sh   run_hardware_detection
    201     case "${SPECIALDEVICE}" in
    202     zotac) echo " \n\n\n \\Z2Zotac Device erkannt!\\Zn \\" >> ${hwtmp} ;;
    203     *) echo " \n\n\n \\ZnStandard Device erkannt!\\Zn \\" >> ${hwtmp} ;;
    204     esac
    205    
    206     echo " \" 13 70" >> ${hwtmp}
    207     chmod a+x ${hwtmp}
    208     ${hwtmp}
    209    
    210     # remove tmp file
    211     if [[ -f ${hwtmp} ]]
    212     then
    213     rm ${hwtmp}
    214     fi
    215  }  }
    216    
    217  dialog_setup_hdd_partitions_manuell()  dialog_setup_hdd_partitions_manuell()
    # Line 241  dialog_setup_hdd_partitions_manuell_flas Line 290  dialog_setup_hdd_partitions_manuell_flas
    290   fi   fi
    291  }  }
    292    
    293    dialog_setup_hdd_partitions_auto()
    294    {
    295     local i
    296    
    297     if [[ -z ${installdevs} ]]
    298     then
    299     dialog \
    300     --backtitle "${TITLE}" \
    301     --ok-label "Beenden" \
    302     --msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70
    303     exit 1
    304     else
    305    
    306     echo "dialog \\" > /tmp/hddtmp.sh
    307     echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh
    308     echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh
    309     echo "--cancel-label \"Beenden\" \\" >> /tmp/hddtmp.sh
    310     echo "--stdout \\" >> /tmp/hddtmp.sh
    311     echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
    312    
    313     for i in ${installdevs}
    314     do
    315     echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
    316     done
    317     echo -e "\n" >> /tmp/hddtmp.sh
    318    
    319     chmod a+x /tmp/hddtmp.sh
    320     HDD="$(/tmp/hddtmp.sh)"
    321     RES=$?
    322     [[ ${RES} -eq 1 ]] && return 1
    323     if [[ ${RES} -eq 0 ]]
    324     then
    325     dialog_setup_hdd_info_auto
    326     dialog_setup_hdd_create_partitions
    327     setup_hdd_partitions_auto
    328     fi
    329     fi
    330    }
    331    
    332    dialog_setup_hdd_create_partitions()
    333    {
    334     dialog \
    335     --backtitle "${TITLE}" \
    336     --infobox "Erstelle Disk Partitionen ..." 3 70
    337    }
    338    
    339  dialog_setup_hdd_format()  dialog_setup_hdd_format()
    340  {  {
    341   dialog \   dialog \
    # Line 323  dialog_main() Line 418  dialog_main()
    418   then   then
    419   case ${METHOD} in   case ${METHOD} in
    420           "1") dialog_setup_system_menu ;;           "1") dialog_setup_system_menu ;;
    421   "2") dialog_setup_hdd_found_manuell ;;   "2") dialog_hardware_detection ;;
    422   "3") install_do_reboot ;;   "3") install_do_reboot ;;
    423   "4") /bin/bash --login -i ;;   "4") /bin/bash --login -i ;;
    424   esac   esac
    # Line 334  dialog_main() Line 429  dialog_main()
    429  #################################################  #################################################
    430  # Install Komandos #  # Install Komandos #
    431  #################################################  #################################################
    432    run_hardware_detection()
    433    {
    434     # check for special devices/clients:
    435     # if zotac a zotac and the disk is a removeable device, then add rootdelay to kernelcmd
    436     local removable=0
    437     if [[ ! -z $(hwinfo --bios --storage | grep -i zotac) ]]
    438     then
    439     for i in /sys/block/[hs]d*/removable
    440     do
    441     if [[ $(< ${i}) = 1 ]]
    442     then
    443     removable=1
    444     fi
    445     done
    446    
    447     export KERNELOPTS="${KERNELOPTS} rootdelay=8"
    448     export SPECIALDEVICE="zotac"
    449     fi
    450    }
    451    
    452    setup_hdd_partitions_auto()
    453    {
    454     ROOTHDD="${HDD}1"
    455    
    456     ## delete disk
    457     dd if=/dev/zero of=${HDD} count=1 &> /dev/null || die
    458    
    459     ## setup one bootable partition
    460     #1. n= new disk
    461     #2. p= primary disk
    462     #3. 1= first partition
    463     #4. ''= default sector start
    464     #5. ''= defaul sector end
    465     #6. a= bootable flag
    466     #7. 1= boot flag for partition 1
    467     #8. w= write/quit
    468     fdisk ${HDD} &> /dev/null << EOF
    469    n
    470    p
    471    1
    472    
    473    
    474    a
    475    1
    476    w
    477    EOF
    478    }
    479    
    480  setup_hdd_partitions_manuell()  setup_hdd_partitions_manuell()
    481  {  {
    482   BOOTHDD="${HDD}1"   BOOTHDD="${HDD}1"
    # Line 387  install_system_image() Line 530  install_system_image()
    530    
    531  install_bootsector_chroot()  install_bootsector_chroot()
    532  {  {
    533   ### grubconf schreiben   local my_roothdd
    534   source ${INSTALLPATH}/boot/kernelversion   local grubconf=${INSTALLPATH}/boot/grub/grub.conf
    535     local grub2conf=/boot/grub/grub.cfg
    536    
    537   #for alx only   # check for grub2
    538   if [ -e ${INSTALLPATH}/etc/alx_version ]   if [[ -f ${INSTALLPATH}/sbin/grub-mkconfig ]]
    539   then   then
    540   OLD_ALXVER="${ALXVER}"   # needed by grub-mkconfig on the first run
    541   source ${INSTALLPATH}/etc/alx_version   if [[ ! -f ${INSTALLPATH}/boot/grub/video.lst ]]
    542   KRNVER="ALX-${ALXVER}"   then
    543   ALXVER="${OLD_ALXVER}"   install -m0644 ${INSTALLPATH}/lib/grub/*/video.lst ${INSTALLPATH}/boot/grub/video.lst || die
    544   fi   fi
    545    
    546   [[ -z ${KRNVER} ]] && KRNVER="AutoSta_LX"   # set kernelopts
    547   [[ -z ${KRNINITRD} ]] && KRNINITRD="initrd"   if [[ -f ${INSTALLPATH}/etc/conf.d/grub ]]
    548     then
    549     sed -i "s:^\(export GRUB_CMDLINE_LINUX_DEFAULT=\).*:\1\"${KERNELOPTS}\":" ${INSTALLPATH}/etc/conf.d/grub || die
    550     else
    551     echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLPATH}/etc/conf.d/grub || die
    552     fi
    553     echo 'grub-mkdevicemap' > ${INSTALLPATH}/root/.installrc || die
    554     echo "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null" >> ${INSTALLPATH}/root/.installrc || die
    555     echo "grub-install --no-floppy ${HDD} &> /dev/null" >> ${INSTALLPATH}/root/.installrc || die
    556     echo "exit 0" >> ${INSTALLPATH}/root/.installrc || die
    557    
    558   local grubconf=${INSTALLPATH}/boot/grub/grub.conf   # grub-legacy
    559   : > ${grubconf} || die   else
    560   echo "default 0" >> ${grubconf} || die   ### grubconf schreiben
    561   echo "timeout 3" >> ${grubconf} || die   source ${INSTALLPATH}/boot/kernelversion
    562   # using current root password  
    563   echo "password --md5 $(cat ${INSTALLPATH}/etc/shadow | grep root | cut -d: -f2)"  >> ${grubconf} || die   #for alx only
    564     if [ -e ${INSTALLPATH}/etc/alx_version ]
    565   echo  >> ${grubconf} || die   then
    566   echo "# normal boot" >> ${grubconf} || die   OLD_ALXVER="${ALXVER}"
    567   echo "title ${KRNVER}" >> ${grubconf} || die   source ${INSTALLPATH}/etc/alx_version
    568   echo "root (hd0,0)" >> ${grubconf} || die   KRNVER="ALX-${ALXVER}"
    569   echo "kernel /boot/vmlinuz root=${ROOTHDD} quiet" >> ${grubconf} || die   ALXVER="${OLD_ALXVER}"
    570   echo "initrd /boot/initrd" >> ${grubconf} || die   fi
    571    
    572   echo >> ${grubconf} || die   [[ -z ${KRNVER} ]] && KRNVER="AutoSta_LX"
    573   echo "# admin boot" >> ${grubconf} || die   [[ -z ${KRNINITRD} ]] && KRNINITRD="initrd"
    574   echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || die   [[ -z ${KRNIMG} ]] && KRNIMG="vmlinuz"
    575   echo "lock"  >> ${grubconf} || die  
    576   echo "root (hd0,0)" >> ${grubconf} || die   # uuid support
    577   echo "kernel /boot/vmlinuz root=${ROOTHDD} quiet hardware-auto-detection" >> ${grubconf} || die   if is_uuid_supported
    578   echo "initrd /boot/initrd" >> ${grubconf} || die   then
    579     my_roothdd="UUID=$(get_uuid ${ROOTHDD})"
    580   echo >> ${grubconf} || die   else
    581   echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || die   my_roothdd="${ROOTHDD}"
    582   echo "lock"  >> ${grubconf} || die   fi
    583   echo "root (hd0,0)" >> ${grubconf} || die  
    584   echo "kernel /boot/vmlinuz root=${ROOTHDD} quiet alx-reset-settings" >> ${grubconf} || die   : > ${grubconf} || die
    585   echo "initrd /boot/initrd" >> ${grubconf} || die   echo "default 0" >> ${grubconf} || die
    586     echo "timeout 3" >> ${grubconf} || die
    587     # using current root password
    588     echo "password --md5 $(cat ${INSTALLPATH}/etc/shadow | grep root | cut -d: -f2)"  >> ${grubconf} || die
    589    
    590     echo  >> ${grubconf} || die
    591     echo "# normal boot" >> ${grubconf} || die
    592     echo "title ${KRNVER}" >> ${grubconf} || die
    593     echo "root (hd0,0)" >> ${grubconf} || die
    594     echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS}" >> ${grubconf} || die
    595     if is_initrd_supported
    596     then
    597     echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
    598     fi
    599    
    600   # bootsector schreiben chrooted schreiben (lfs/magellan)   echo >> ${grubconf} || die
    601   cat > ${INSTALLPATH}/root/.bashrc << CHROOTEOF   echo "# admin boot" >> ${grubconf} || die
    602     echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || die
    603     echo "lock"  >> ${grubconf} || die
    604     echo "root (hd0,0)" >> ${grubconf} || die
    605     echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} hardware-auto-detection" >> ${grubconf} || die
    606     if is_initrd_supported
    607     then
    608     echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
    609     fi
    610    
    611     echo >> ${grubconf} || die
    612     echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || die
    613     echo "lock"  >> ${grubconf} || die
    614     echo "root (hd0,0)" >> ${grubconf} || die
    615     echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} alx-reset-settings" >> ${grubconf} || die
    616     if is_initrd_supported
    617     then
    618     echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
    619     fi
    620    
    621     # bootsector schreiben chrooted schreiben (lfs/magellan)
    622     cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF
    623  /usr/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null  /usr/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null
    624  root (hd0,0)  root (hd0,0)
    625  setup (hd0)  setup (hd0)
    # Line 440  quit Line 627  quit
    627  EOF  EOF
    628  exit 0  exit 0
    629  CHROOTEOF  CHROOTEOF
    630     fi
    631    
    632   ## enters chroot   ## enters chroot
    633   mount -t proc proc ${INSTALLPATH}/proc   mount -t proc proc ${INSTALLPATH}/proc
    634   mount -t sysfs sysfs ${INSTALLPATH}/sys   mount -t sysfs sysfs ${INSTALLPATH}/sys
    635   mount -o bind /dev ${INSTALLPATH}/dev   mount -o bind /dev ${INSTALLPATH}/dev
    636   chroot ${INSTALLPATH} /bin/bash --rcfile /root/.bashrc -i   chroot ${INSTALLPATH} /bin/bash --rcfile /root/.installrc -i
    637   umount ${INSTALLPATH}/proc   umount ${INSTALLPATH}/proc
    638   umount ${INSTALLPATH}/sys   umount ${INSTALLPATH}/sys
    639   umount ${INSTALLPATH}/dev   umount ${INSTALLPATH}/dev
    640   rm ${INSTALLPATH}/root/.bashrc   rm ${INSTALLPATH}/root/.installrc
    641    }
    642    
    643    is_initrd_supported()
    644    {
    645     # only generate initrds if the cmd exists
    646     [[ -x ${INSTALLPATH}/sbin/mkinitrd ]] && return 0
    647     return 1
    648  }  }
    649    
    650  install_mkinitrd_chroot()  install_initrd_chroot()
    651  {  {
    652   cat > ${INSTALLPATH}/root/.bashrc << CHROOTEOF   # only generate initrds if the cmd exists
    653  echo "MODULES=\"ext3 amd74xx piix sis5513 via82cxxx sd_mod ata_piix pata_amd pata_mpiix pata_oldpiix pata_sis pata_via sata_via sata_sis sata_nv\"" > /etc/conf.d/mkinitrd   is_initrd_supported || return 0
    654    
    655     DISKMODS="sd_mod"
    656     OLDPATAMODS="amd74xx piix sis5513 via82cxxx"
    657     PATAMODS="ata_piix pata_amd pata_mpiix pata_oldpiix pata_sis pata_via"
    658     SATAMODS="sata_via sata_sis sata_nv"
    659     DRMMODS="i915 mga nouveau r128 radeon savage sis tdfx ttm via"
    660     FBMODS="uvesafb"
    661    
    662     # install an appropriate uvesafb.conf
    663     install -d ${INSTALLPATH}/etc/modprobe.d || die
    664     echo "options uvesafb mode_option=1024x768-32@60 scroll=ywrap" > ${INSTALLPATH}/etc/modprobe.d/uvesafb.conf || die
    665    
    666     cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF
    667    echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS}\"" > /etc/conf.d/mkinitrd
    668  mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g") > /dev/null  mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g") > /dev/null
    669  exit 0  exit 0
    670  CHROOTEOF  CHROOTEOF
    # Line 464  CHROOTEOF Line 673  CHROOTEOF
    673   mount -t proc proc ${INSTALLPATH}/proc   mount -t proc proc ${INSTALLPATH}/proc
    674   mount -t sysfs sysfs ${INSTALLPATH}/sys   mount -t sysfs sysfs ${INSTALLPATH}/sys
    675   mount -o bind /dev ${INSTALLPATH}/dev   mount -o bind /dev ${INSTALLPATH}/dev
    676   chroot ${INSTALLPATH} /bin/bash --rcfile /root/.bashrc -i   chroot ${INSTALLPATH} /bin/bash --rcfile /root/.installrc -i
    677   umount ${INSTALLPATH}/proc   umount ${INSTALLPATH}/proc
    678   umount ${INSTALLPATH}/sys   umount ${INSTALLPATH}/sys
    679   umount ${INSTALLPATH}/dev   umount ${INSTALLPATH}/dev
    680   rm ${INSTALLPATH}/root/.bashrc   rm ${INSTALLPATH}/root/.installrc
    681  }  }
    682    
    683  get_blkid()  is_uuid_supported()
    684    {
    685     if [[ -x $(which busybox.mkinitrd &> /dev/null) ]]
    686     then
    687     # only detect uuids if supported
    688     if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]
    689     then
    690     return 0
    691     fi
    692     fi
    693    
    694     return 1
    695    }
    696    
    697    get_uuid()
    698  {  {
    699   local UUID   local UUID
    700   local SEC_TYPE   local SEC_TYPE
    701   local TYPE   local TYPE
    702    
    703   local dev="$1"   local dev="$1"
    704   [[ -z ${dev} ]] && die "no dev given"   [[ -z ${dev} ]] && die "no dev given"
    705    
    706   eval $(busybox.mkinitrd blkid ${dev} | grep "${dev}:" | sed 's/.*:\ //')   # check if given device is already an UUID
    707   echo ${UUID}   if [[ ${dev/UUID=/}x != ${dev}x ]]
    708     then
    709     eval "${dev}"
    710     else
    711     eval $(busybox.mkinitrd blkid ${dev} | grep "${dev}:" | sed 's/.*:\ //')
    712     fi
    713     echo "${UUID}"
    714  }  }
    715    
    716  install_system_settings()  install_system_settings()
    717  {  {
    718   # schreibe fstab   # schreibe fstab
    719   echo -e "$(get_blkid ${BOOTHDD})\t/boot\text3\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die   if is_uuid_supported
    720   echo -e "$(get_blkid ${ROOTHDD})\t/\text3\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die   then
    721   echo -e "$(get_blkid ${SWAPHDD})\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
    722     echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
    723     else
    724     echo -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
    725     echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
    726     fi
    727     # not needed busybox loads all with swapon -a, even if not mentioned in fstab
    728     #echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die
    729   echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
    730   echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
    731    
    # Line 500  install_system_settings() Line 736  install_system_settings()
    736  install_system_settings_flash()  install_system_settings_flash()
    737  {  {
    738   # schreibe fstab   # schreibe fstab
    739   echo -e "$(get_blkid ${ROOTHDD})\t/\text3\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die   if is_uuid_supported
    740     then
    741     echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die
    742     else
    743     echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die
    744     fi
    745   echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
    746   echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
    747  }  }
    # Line 530  install_do_reboot() Line 771  install_do_reboot()
    771    
    772  run_install_normal()  run_install_normal()
    773  {  {
    774   dialog_setup_hdd_found_manuell   dialog_hardware_detection
    775    
    776   dialog_setup_hdd_partitions_manuell   dialog_setup_hdd_partitions_manuell
    777   dialog_setup_hdd_format   dialog_setup_hdd_format
    # Line 538  run_install_normal() Line 779  run_install_normal()
    779   install_mount_rootfs   install_mount_rootfs
    780   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
    781    
      dialog_install_bootsector  
      install_bootsector_chroot  
       
    782   dialog_install_settings   dialog_install_settings
    783   sleep 1   sleep 1
    784   install_system_settings   install_system_settings
    785   install_mkinitrd_chroot   install_initrd_chroot
    786    
    787     dialog_install_bootsector
    788     install_bootsector_chroot
    789    
    790   install_umount_rootfs   install_umount_rootfs
    791   dialog_install_successful   dialog_install_successful
    792  }  }
    793    
    794  run_install_flash()  run_install_flash()
    795  {  {
    796   dialog_setup_hdd_found_manuell   dialog_hardware_detection
    797    
    798   dialog_setup_hdd_partitions_manuell_flash   dialog_setup_hdd_partitions_manuell_flash
    799   dialog_setup_hdd_format   dialog_setup_hdd_format
    # Line 559  run_install_flash() Line 801  run_install_flash()
    801   install_mount_rootfs_flash   install_mount_rootfs_flash
    802   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
    803    
    804     dialog_install_settings
    805     sleep 1
    806     install_system_settings_flash
    807     install_initrd_chroot
    808    
    809   dialog_install_bootsector   dialog_install_bootsector
    810   install_bootsector_chroot   install_bootsector_chroot
    811    
    812     install_umount_rootfs_flash
    813     dialog_install_successful
    814    }
    815    
    816    run_install_auto()
    817    {
    818     dialog_hardware_detection
    819    
    820     dialog_setup_hdd_partitions_auto
    821     dialog_setup_hdd_format
    822     setup_hdd_format_flash > /dev/null
    823     install_mount_rootfs_flash
    824     (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
    825    
    826   dialog_install_settings   dialog_install_settings
    827   sleep 1   sleep 1
    828   install_system_settings_flash   install_system_settings_flash
    829   install_mkinitrd_chroot   install_initrd_chroot
    830    
    831     dialog_install_bootsector
    832     install_bootsector_chroot
    833    
    834   install_umount_rootfs_flash   install_umount_rootfs_flash
    835   dialog_install_successful   dialog_install_successful
    836  }  }
    Legend:
    Removed from v.1180  
    changed lines
      Added in v.2573