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 2418 by niro, Tue Jan 7 13:43:24 2014 UTC revision 2428 by niro, Tue Jan 7 14:11:12 2014 UTC
    # Line 27  for inc in %SYSCONFDIR%/installer.conf \ Line 27  for inc in %SYSCONFDIR%/installer.conf \
    27   ${INSTALLER_LIBDIR}/functions/common.sh \   ${INSTALLER_LIBDIR}/functions/common.sh \
    28   ${INSTALLER_LIBDIR}/functions/common-dialogs.sh \   ${INSTALLER_LIBDIR}/functions/common-dialogs.sh \
    29   ${INSTALLER_LIBDIR}/functions/hwdetection.sh \   ${INSTALLER_LIBDIR}/functions/hwdetection.sh \
    30     ${INSTALLER_LIBDIR}/functions/bootloader.sh \
    31     ${INSTALLER_LIBDIR}/functions/initrd-tools.sh \
    32   ${INSTALLER_LIBDIR}/functions/installer-dialogs.sh   ${INSTALLER_LIBDIR}/functions/installer-dialogs.sh
    33  do  do
    34   if [ -e ${inc} ]   if [ -e ${inc} ]
    # Line 191  dialog_hardware_detection() Line 193  dialog_hardware_detection()
    193  dialog_setup_hdd_partitions_manual()  dialog_setup_hdd_partitions_manual()
    194  {  {
    195   local i   local i
    196     local retval
    197    
    198   if [[ -z ${ALL_DISKS} ]]   if [[ -z ${ALL_DISKS} ]]
    199   then   then
    200   dialog \   dialog_no_harddrive_found
      --backtitle "${TITLE}" \  
      --ok-label "Beenden" \  
      --msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70  
    201   exit 1   exit 1
    202   else   else
    203     HDD=$(dialog_select_target_harddrive)
    204   echo "dialog \\" > /tmp/hddtmp.sh   retval=$?
    205   echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh   [[ ${retval} -eq 1 ]] && return 1
    206   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 ]]  
    207   then   then
    208   dialog_setup_hdd_info   dialog_setup_hdd_info
    209   setup_hdd_partitions_manual   setup_hdd_partitions_manual
    # Line 229  dialog_setup_hdd_partitions_manual() Line 214  dialog_setup_hdd_partitions_manual()
    214  dialog_setup_hdd_partitions_auto()  dialog_setup_hdd_partitions_auto()
    215  {  {
    216   local i   local i
    217     local retval
    218    
    219   if [[ -z ${installdevs} ]]   if [[ -z ${ALL_DISKS} ]]
    220   then   then
    221   dialog \   dialog_no_harddrive_found
      --backtitle "${TITLE}" \  
      --ok-label "Beenden" \  
      --msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70  
    222   exit 1   exit 1
    223   else   else
    224     HDD=$(dialog_select_target_harddrive)
    225   echo "dialog \\" > /tmp/hddtmp.sh   retval=$?
    226   echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh   [[ ${retval} -eq 1 ]] && return 1
    227   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 ${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=$?  
      [[ ${RES} -eq 1 ]] && return 1  
      if [[ ${RES} -eq 0 ]]  
    228   then   then
    229   dialog_setup_hdd_info_auto   dialog_setup_hdd_info_auto
    230   dialog_setup_hdd_create_partitions   dialog_setup_hdd_create_partitions
    # Line 280  run_hardware_detection_disks() Line 248  run_hardware_detection_disks()
    248   export ALL_CDROMS="$(get_hwinfo cdrom)"   export ALL_CDROMS="$(get_hwinfo cdrom)"
    249  }  }
    250    
    251  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()  
    252  {  {
    253   while [[ ${CURRENTLINE} != ${TOTALLINES} ]]   while [[ ${CURRENTLINE} != ${TOTALLINES} ]]
    254   do   do
    # Line 321  dialog_install_meter() Line 261  dialog_install_meter()
    261   return 0   return 0
    262  }  }
    263    
       
     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  
     }  
       
    264  dialog_main()  dialog_main()
    265  {  {
    266   METHOD=0   local method=0
    267     local retval
    268    
    269   while [[ ${METHOD} -le 2 ]]   while [[ ${method} -le 2 ]]
    270   do   do
    271   METHOD=$(dialog \   method=$(menubox $"Configuration:" \
    272   --backtitle "${TITLE}" \   $"1:Install system" \
    273   --no-cancel \   $"2:Show detected harddrives" \
    274   --ok-label "Weiter" \   $"3:Exit and reboot" \
    275   --stdout \   $"4:Exit and drop into a shell")
    276   --menu "Konfiguration" 14 70 5 \   retval=$?
    277   "1" "AutoSta_LX installieren" \   [[ ${retval} -eq 1 ]] && exit 1
    278   "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 ]]  
    279   then   then
    280   case ${METHOD} in   case ${method} in
    281   "1") dialog_setup_system_menu ;;   "1") dialog_setup_system_menu ;;
    282   "2") dialog_hardware_detection ;;   "2") dialog_hardware_detection ;;
    283   "3") install_do_reboot ;;   "3") install_do_reboot ;;
    # Line 802  run_install_normal() Line 712  run_install_normal()
    712   dialog_setup_hdd_format   dialog_setup_hdd_format
    713   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
    714   install_mount_rootfs   install_mount_rootfs
    715   (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
    716    
    717   dialog_install_settings   dialog_install_settings
    718   sleep 1   sleep 1
    719   install_system_settings   install_system_settings
    720     dialog_install_initrd
    721   install_initrd_chroot   install_initrd_chroot
    722    
    723   dialog_install_bootsector   dialog_install_bootsector
    # Line 824  run_install_auto() Line 735  run_install_auto()
    735   dialog_setup_hdd_format   dialog_setup_hdd_format
    736   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
    737   install_mount_rootfs   install_mount_rootfs
    738   (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
    739    
    740   dialog_install_settings   dialog_install_settings
    741   sleep 1   sleep 1
    742   install_system_settings   install_system_settings
    743     dialog_install_initrd
    744   install_initrd_chroot   install_initrd_chroot
    745    
    746   dialog_install_bootsector   dialog_install_bootsector
    Legend:
    Removed from v.2418  
    changed lines
      Added in v.2428