Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/installer-simple/bin/installer.sh.in

    Diff of /trunk/installer-simple/bin/installer.sh.in

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

    revision 2412 by niro, Tue Jan 7 13:33:46 2014 UTC revision 2421 by niro, Tue Jan 7 13:50:50 2014 UTC
    # Line 127  dialog_setup_system_menu() Line 127  dialog_setup_system_menu()
    127   local mode   local mode
    128   local retval   local retval
    129    
    130   mode=$(dialog \   mode=$(menubox -h $"[ Harddrive partitioning ]" $"\nSelect an installation mode" \
    131   --backtitle "${TITLE}" \   $"1:Automatic setup (recommended)" \
    132   --title "[ Festplatten Partitionierung ]" \   ":" \
    133   --cancel-label "Abbrechen" \   $":\Z1Expert modes:\Zn" \
    134   --ok-label "Weiter" \   $"2:Common IDE-disk (manual setup)")
      --stdout \  
      --colors \  
      --menu "\nWaehlen Sie die Installations-Methode" 14 70 5 \  
      "1" "Automatisches Setup (Empfohlen)" \  
      "" "" \  
      "" "\Z1Experten Modi:\Zn" \  
      "2" "Normale IDE-Disk (Manuell)" \  
    135   retval=$?   retval=$?
    136   [[ ${retval} -eq 1 ]] && return 1   [[ ${retval} -eq 1 ]] && return 1
    137   if [[ ${retval} -eq 0 ]]   if [[ ${retval} -eq 0 ]]
    138   then   then
    139   case "${i}" in   case "${mode}" in
    140   "1") run_install_auto ;;   "1") run_install_auto ;;
    141   "2") run_install_normal ;;   "2") run_install_normal ;;
    142   "") dialog_setup_system_menu;;   "") dialog_setup_system_menu;;
    # Line 153  dialog_setup_system_menu() Line 146  dialog_setup_system_menu()
    146    
    147  dialog_hardware_detection()  dialog_hardware_detection()
    148  {  {
    149   local i   local message
      local hwtmp  
       
      if [ -x $(type -P mktemp) ]  
      then  
      hwtmp="$(mktemp)"  
      else  
      hwtmp="/tmp/hwtmp.sh"  
      fi  
    150    
    151   run_hardware_detection_disks   run_hardware_detection_disks
    152    
    153   echo "dialog \\"  > ${hwtmp}   message+=$"Harddrives:\n"
      echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}  
      echo "--ok-label \"Weiter\" \\" >> ${hwtmp}  
      echo "--stdout \\" >> ${hwtmp}  
      echo "--colors \\" >> ${hwtmp}  
      echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}  
      echo " Festplatten:\n \\" >> ${hwtmp}  
    154    
    155   if [[ ! -z ${ALL_DISKS} ]]   if [[ ! -z ${ALL_DISKS} ]]
    156   then   then
    157   for i in ${ALL_DISKS}   for i in ${ALL_DISKS}
    158   do   do
    159   echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp}   message+="\Z3${i}\Zn "
    160   done   done
    161     message+="\n"
    162   fi   fi
    163    
    164   if [[ ! -z ${ALL_CDROMS} ]]   if [[ ! -z ${ALL_CDROMS} ]]
    165   then   then
    166   echo " \n \\" >> ${hwtmp}   message+="\n"
    167   echo " CDROM Laufwerke:\n \\" >> ${hwtmp}   message+=$"Optical disk drives:\n"
    168   for i in ${ALL_CDROMS}   for i in ${ALL_CDROMS}
    169   do   do
    170   echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp}   message+="\Z3${i}\Zn"
    171   done   done
    172     message+="\n"
    173   fi   fi
    174    
    175   # other devices   # other devices
    176   run_hardware_detection   run_hardware_detection
    177   case "${SPECIALDEVICE}" in   case "${SPECIALDEVICE}" in
    178   zotac*) echo " \n\n\n \\Z2Zotac Device erkannt.\\Zn \\" >> ${hwtmp} ;;   zotac*) message+=$"\n\Z2Zotac device detected.\Zn" ;;
    179   rangee) echo " \n\n\n \\Z2Rangee Device erkannt.\\Zn \\" >> ${hwtmp} ;;   rangee) message+=$"\n\Z2Rangee device detected.\Zn" ;;
    180   maxdata) echo " \n\n\n \\Z2Maxdata Device erkannt.\\Zn \\" >> ${hwtmp} ;;   maxdata) message+=$"\n\Z2Maxdata device detected.\Zn" ;;
    181   *) echo " \n\n\n \\ZnStandard Device erkannt.\\Zn \\" >> ${hwtmp} ;;   *) message+=$"\n \\ZnCommon device detected.\Zn" ;;
    182   esac   esac
    183   if [[ ${FORMFACTOR} = laptop ]]   if [[ ${FORMFACTOR} = laptop ]]
    184   then   then
    185   echo " \n \\ZnFormfactor Laptop, Powersave Modus 'ondemand' wird aktiviert.\\Zn \\" >> ${hwtmp}   message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving  mode.\Zn"
    186   fi   fi
    187    
    188   echo " \" 14 70" >> ${hwtmp}   messagebox -y 15 -h $"Detected hardware:" "${message}"
      chmod a+x ${hwtmp}  
      ${hwtmp}  
       
      # remove tmp file  
      if [[ -f ${hwtmp} ]]  
      then  
      rm ${hwtmp}  
      fi  
    189  }  }
    190    
    191  dialog_setup_hdd_partitions_manuell()  dialog_setup_hdd_partitions_manual()
    192  {  {
    193   local i   local i
    194    
    195   if [[ -z ${installdevs} ]]   if [[ -z ${ALL_DISKS} ]]
    196   then   then
    197   dialog \   dialog_no_harddrive_found
      --backtitle "${TITLE}" \  
      --ok-label "Beenden" \  
      --msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70  
    198   exit 1   exit 1
    199   else   else
    200    
    # Line 235  dialog_setup_hdd_partitions_manuell() Line 205  dialog_setup_hdd_partitions_manuell()
    205   echo "--stdout \\" >> /tmp/hddtmp.sh   echo "--stdout \\" >> /tmp/hddtmp.sh
    206   echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh   echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
    207    
    208   for i in ${installdevs}   for i in ${ALL_DISKS}
    209   do   do
    210   echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh   echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
    211   done   done
    # Line 248  dialog_setup_hdd_partitions_manuell() Line 218  dialog_setup_hdd_partitions_manuell()
    218   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
    219   then   then
    220   dialog_setup_hdd_info   dialog_setup_hdd_info
    221   setup_hdd_partitions_manuell   setup_hdd_partitions_manual
    222   fi   fi
    223   fi   fi
    224  }  }
    # Line 257  dialog_setup_hdd_partitions_auto() Line 227  dialog_setup_hdd_partitions_auto()
    227  {  {
    228   local i   local i
    229    
    230   if [[ -z ${installdevs} ]]   if [[ -z ${ALL_DISKS} ]]
    231   then   then
    232   dialog \   dialog_no_harddrive_found
      --backtitle "${TITLE}" \  
      --ok-label "Beenden" \  
      --msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70  
    233   exit 1   exit 1
    234   else   else
    235    
    # Line 273  dialog_setup_hdd_partitions_auto() Line 240  dialog_setup_hdd_partitions_auto()
    240   echo "--stdout \\" >> /tmp/hddtmp.sh   echo "--stdout \\" >> /tmp/hddtmp.sh
    241   echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh   echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
    242    
    243   for i in ${installdevs}   for i in ${ALL_DISKS}
    244   do   do
    245   echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh   echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
    246   done   done
    # Line 544  EOF Line 511  EOF
    511   fi   fi
    512  }  }
    513    
    514  setup_hdd_partitions_manuell()  setup_hdd_partitions_manual()
    515  {  {
    516   ROOTHDD="${HDD}1"   ROOTHDD="${HDD}1"
    517    
    518   ## hdds partitionieren manuell   ## hdds partitionieren manual
    519   cfdisk ${HDD} || dialog_die   cfdisk ${HDD} || dialog_die
    520  }  }
    521    
    # Line 825  run_install_normal() Line 792  run_install_normal()
    792  {  {
    793   dialog_hardware_detection   dialog_hardware_detection
    794    
    795   dialog_setup_hdd_partitions_manuell   dialog_setup_hdd_partitions_manual
    796   dialog_setup_hdd_format   dialog_setup_hdd_format
    797   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
    798   install_mount_rootfs   install_mount_rootfs
    Legend:
    Removed from v.2412  
    changed lines
      Added in v.2421