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 2419 by niro, Tue Jan 7 13:44:59 2014 UTC revision 2423 by niro, Tue Jan 7 13:55:26 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 \   dialog_no_harddrive_found
      --backtitle "${TITLE}" \  
      --ok-label "Beenden" \  
      --msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70  
    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 229  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 \   dialog_no_harddrive_found
      --backtitle "${TITLE}" \  
      --ok-label "Beenden" \  
      --msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70  
    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 308  dialog_install_system_image() Line 274  dialog_install_system_image()
    274   --gauge "Kopiere System-Image ..." 6 80   --gauge "Kopiere System-Image ..." 6 80
    275  }  }
    276    
    277  dialog_install_meter()  install_meter()
    278  {  {
    279   while [[ ${CURRENTLINE} != ${TOTALLINES} ]]   while [[ ${CURRENTLINE} != ${TOTALLINES} ]]
    280   do   do
    # Line 802  run_install_normal() Line 768  run_install_normal()
    768   dialog_setup_hdd_format   dialog_setup_hdd_format
    769   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
    770   install_mount_rootfs   install_mount_rootfs
    771   (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
    772    
    773   dialog_install_settings   dialog_install_settings
    774   sleep 1   sleep 1
    # Line 824  run_install_auto() Line 790  run_install_auto()
    790   dialog_setup_hdd_format   dialog_setup_hdd_format
    791   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
    792   install_mount_rootfs   install_mount_rootfs
    793   (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
    794    
    795   dialog_install_settings   dialog_install_settings
    796   sleep 1   sleep 1
    Legend:
    Removed from v.2419  
    changed lines
      Added in v.2423