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 2421 by niro, Tue Jan 7 13:50:50 2014 UTC revision 2426 by niro, Tue Jan 7 14:06:18 2014 UTC
    # Line 191  dialog_hardware_detection() Line 191  dialog_hardware_detection()
    191  dialog_setup_hdd_partitions_manual()  dialog_setup_hdd_partitions_manual()
    192  {  {
    193   local i   local i
    194     local retval
    195    
    196   if [[ -z ${ALL_DISKS} ]]   if [[ -z ${ALL_DISKS} ]]
    197   then   then
    198   dialog_no_harddrive_found   dialog_no_harddrive_found
    199   exit 1   exit 1
    200   else   else
    201     HDD=$(dialog_select_target_harddrive)
    202   echo "dialog \\" > /tmp/hddtmp.sh   retval=$?
    203   echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh   [[ ${retval} -eq 1 ]] && return 1
    204   echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh   if [[ ${retval} -eq 0 ]]
      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 ${ALL_DISKS}  
      do  
      echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh  
      done  
      echo -e "\n" >> /tmp/hddtmp.sh  
       
      chmod a+x /tmp/hddtmp.sh  
      HDD="$(/tmp/hddtmp.sh)"  
      RES=$?  
      [[ ${RES} -eq 1 ]] && return 1  
      if [[ ${RES} -eq 0 ]]  
    205   then   then
    206   dialog_setup_hdd_info   dialog_setup_hdd_info
    207   setup_hdd_partitions_manual   setup_hdd_partitions_manual
    # Line 226  dialog_setup_hdd_partitions_manual() Line 212  dialog_setup_hdd_partitions_manual()
    212  dialog_setup_hdd_partitions_auto()  dialog_setup_hdd_partitions_auto()
    213  {  {
    214   local i   local i
    215     local retval
    216    
    217   if [[ -z ${ALL_DISKS} ]]   if [[ -z ${ALL_DISKS} ]]
    218   then   then
    219   dialog_no_harddrive_found   dialog_no_harddrive_found
    220   exit 1   exit 1
    221   else   else
    222     HDD=$(dialog_select_target_harddrive)
    223   echo "dialog \\" > /tmp/hddtmp.sh   retval=$?
    224   echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh   [[ ${retval} -eq 1 ]] && return 1
    225   echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh   if [[ ${retval} -eq 0 ]]
      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 ${ALL_DISKS}  
      do  
      echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh  
      done  
      echo -e "\n" >> /tmp/hddtmp.sh  
       
      chmod a+x /tmp/hddtmp.sh  
      HDD="$(/tmp/hddtmp.sh)"  
      RES=$?  
      [[ ${RES} -eq 1 ]] && return 1  
      if [[ ${RES} -eq 0 ]]  
    226   then   then
    227   dialog_setup_hdd_info_auto   dialog_setup_hdd_info_auto
    228   dialog_setup_hdd_create_partitions   dialog_setup_hdd_create_partitions
    # Line 274  run_hardware_detection_disks() Line 246  run_hardware_detection_disks()
    246   export ALL_CDROMS="$(get_hwinfo cdrom)"   export ALL_CDROMS="$(get_hwinfo cdrom)"
    247  }  }
    248    
    249  dialog_setup_hdd_create_partitions()  install_meter()
     {  
      dialog \  
      --backtitle "${TITLE}" \  
      --infobox "Erstelle Disk Partitionen ..." 3 70  
     }  
       
     dialog_setup_hdd_format()  
     {  
      dialog \  
      --backtitle "${TITLE}" \  
      --infobox "Erstelle Datei-Systeme ..." 3 70  
     }  
       
     dialog_install_settings()  
     {  
      dialog \  
      --backtitle "${TITLE}" \  
      --infobox "Speichere System-Einstellungen ..." 3 70  
     }  
       
     dialog_install_system_image()  
     {  
      dialog \  
      --backtitle "${TITLE}" \  
      --gauge "Kopiere System-Image ..." 6 80  
     }  
       
     dialog_install_meter()  
    250  {  {
    251   while [[ ${CURRENTLINE} != ${TOTALLINES} ]]   while [[ ${CURRENTLINE} != ${TOTALLINES} ]]
    252   do   do
    # Line 315  dialog_install_meter() Line 259  dialog_install_meter()
    259   return 0   return 0
    260  }  }
    261    
       
     dialog_install_bootsector()  
     {  
      dialog \  
      --backtitle "${TITLE}" \  
      --infobox "Schreibe den Bootsektor ..." 3 70  
     }  
       
     dialog_install_successful()  
     {  
      dialog \  
      --backtitle "${TITLE}" \  
      --colors \  
      --msgbox "Die Installation war \Z2erfolgreich\Zn." 5 81  
     }  
       
     dialog_install_failure()  
     {  
      dialog \  
      --backtitle "${TITLE}" \  
      --colors \  
      --msgbox "Die Installation ist \Z1Fehlgeschlagen\Zn.\n\n\  
      Fehler bei ${ERROR}, RetVal: ${RETVAL} \  
      " 10 81  
     }  
       
    262  dialog_main()  dialog_main()
    263  {  {
    264   METHOD=0   local method=0
    265     local retval
    266    
    267   while [[ ${METHOD} -le 2 ]]   while [[ ${method} -le 2 ]]
    268   do   do
    269   METHOD=$(dialog \   method=$(menubox $"Configuration:" \
    270   --backtitle "${TITLE}" \   $"1:Install system" \
    271   --no-cancel \   $"2:Show detected harddrives" \
    272   --ok-label "Weiter" \   $"3:Exit and reboot" \
    273   --stdout \   $"4:Exit and drop into a shell")
    274   --menu "Konfiguration" 14 70 5 \   retval=$?
    275   "1" "AutoSta_LX installieren" \   [[ ${retval} -eq 1 ]] && exit 1
    276   "2" "Uebersicht gefundener Laufwerke" \   if [[ ${retval} -eq 0 ]]
      "3" "Beenden und neustarten" \  
      "4" "Beenden und eine Shell starten")  
      RES=$?  
      [[ ${RES} -eq 1 ]] && exit 1  
      if [[ ${RES} -eq 0 ]]  
    277   then   then
    278   case ${METHOD} in   case ${method} in
    279   "1") dialog_setup_system_menu ;;   "1") dialog_setup_system_menu ;;
    280   "2") dialog_hardware_detection ;;   "2") dialog_hardware_detection ;;
    281   "3") install_do_reboot ;;   "3") install_do_reboot ;;
    # Line 796  run_install_normal() Line 710  run_install_normal()
    710   dialog_setup_hdd_format   dialog_setup_hdd_format
    711   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
    712   install_mount_rootfs   install_mount_rootfs
    713   (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 | install_meter | dialog_install_system_image
    714    
    715   dialog_install_settings   dialog_install_settings
    716   sleep 1   sleep 1
    # Line 818  run_install_auto() Line 732  run_install_auto()
    732   dialog_setup_hdd_format   dialog_setup_hdd_format
    733   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
    734   install_mount_rootfs   install_mount_rootfs
    735   (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 | install_meter | dialog_install_system_image
    736    
    737   dialog_install_settings   dialog_install_settings
    738   sleep 1   sleep 1
    Legend:
    Removed from v.2421  
    changed lines
      Added in v.2426