Magellan Linux

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

    Diff of /tags/installer-simple-0_4_90_20140703_1/bin/installer.sh.in

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

    revision 2482 by niro, Wed Jan 8 10:32:55 2014 UTC revision 2491 by niro, Wed Jan 8 12:22:26 2014 UTC
    # Line 100  install_meter() Line 100  install_meter()
    100   return 0   return 0
    101  }  }
    102    
    103    mount_rootfs()
    104    {
    105     local retval
    106    
    107     if is_mounted --location "${INSTALLROOT}"
    108     then
    109     echo $"${INSTALLROOT} already mounted" >&2
    110     else
    111     mount "${ROOTHDD}" "${INSTALLROOT}" || dialog_die $"Could not mount rootfs - drive'${ROOTHDD}' -> '${INSTALLROOT}'"
    112     fi
    113     [[ -d ${INSTALLROOT}/boot ]] || install -d ${INSTALLROOT}/boot
    114    }
    115    
    116    umount_rootfs()
    117    {
    118     is_mounted --location ${INSTALLROOT}/boot && umount ${INSTALLROOT}/boot
    119     is_mounted --location ${INSTALLROOT} && umount ${INSTALLROOT}
    120    }
    121    
    122    install_do_reboot()
    123    {
    124     reboot
    125    }
    126    
    127  run_hardware_detection()  run_hardware_detection()
    128  {  {
    # Line 188  setup_hdd_partitions_auto() Line 211  setup_hdd_partitions_auto()
    211   # run this only if FDISKPARTITIONBELOW256MB is not already 1   # run this only if FDISKPARTITIONBELOW256MB is not already 1
    212   if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]   if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
    213   then   then
    214   if hdd_size_below_256mb ${HDD}   if device_minimum_size "${HDD}" 256
    215   then   then
    216   FDISKPARTIONBELOW256MB=1   FDISKPARTIONBELOW256MB=1
    217   else   else
    # Line 263  setup_hdd_format() Line 286  setup_hdd_format()
    286   mkfs."${FORMAT_FILESYSTEM}" -q "${ROOTHDD}" || dialog_die   mkfs."${FORMAT_FILESYSTEM}" -q "${ROOTHDD}" || dialog_die
    287  }  }
    288    
     install_mount_rootfs()  
     {  
      is_mounted --location "${INSTALLROOT}" || mount "${ROOTHDD}" "${INSTALLROOT}"  
      install -d ${INSTALLROOT}/boot || dialog_die  
     }  
       
    289  install_system_image()  install_system_image()
    290  {  {
    291   pushd ${INSTALLROOT} > /dev/null   pushd ${INSTALLROOT} > /dev/null
    # Line 310  install_system_settings() Line 327  install_system_settings()
    327   fi   fi
    328  }  }
    329    
     install_umount_rootfs()  
     {  
      is_mounted --location ${INSTALLROOT}/boot && umount ${INSTALLROOT}/boot  
      is_mounted --location ${INSTALLROOT} && umount ${INSTALLROOT}  
     }  
       
     install_do_reboot()  
     {  
      reboot  
     }  
       
    330    
    331  ### installer dialogs ###  ### installer dialogs ###
    332    
    # Line 483  run_install_normal() Line 489  run_install_normal()
    489   task_setup_hdd_partitions_manual   task_setup_hdd_partitions_manual
    490   dialog_setup_hdd_format   dialog_setup_hdd_format
    491   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
    492   install_mount_rootfs   mount_rootfs
    493   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image
    494    
    495   dialog_install_settings   dialog_install_settings
    # Line 500  run_install_normal() Line 506  run_install_normal()
    506   bootloader_config   bootloader_config
    507   bootloader_install   bootloader_install
    508    
    509   install_umount_rootfs   umount_rootfs
    510   dialog_install_successful   dialog_install_successful
    511  }  }
    512    
    # Line 511  run_install_auto() Line 517  run_install_auto()
    517   task_setup_hdd_partitions_auto   task_setup_hdd_partitions_auto
    518   dialog_setup_hdd_format   dialog_setup_hdd_format
    519   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
    520   install_mount_rootfs   mount_rootfs
    521   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image
    522    
    523   dialog_install_settings   dialog_install_settings
    # Line 528  run_install_auto() Line 534  run_install_auto()
    534   bootloader_config   bootloader_config
    535   bootloader_install   bootloader_install
    536    
    537   install_umount_rootfs   umount_rootfs
    538   dialog_install_successful   dialog_install_successful
    539  }  }
    540    
    Legend:
    Removed from v.2482  
    changed lines
      Added in v.2491