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 2885 by niro, Fri Jul 31 10:09:08 2015 UTC revision 2886 by niro, Fri Jul 31 10:43:21 2015 UTC
    # Line 222  run_hardware_detection_disks() Line 222  run_hardware_detection_disks()
    222    
    223  setup_hdd_partitions()  setup_hdd_partitions()
    224  {  {
      case "${INSTALL_METHOD}" in  
      auto)  
      BOOTHDD=""  
      SWAPHDD=""  
      ROOTHDD="${HDD}1"  
      ;;  
      normal)  
      BOOTHDD="${HDD}1"  
      SWAPHDD="${HDD}2"  
      ROOTHDD="${HDD}3"  
      ;;  
      esac  
       
    225   # sanity check - should not happen   # sanity check - should not happen
    226   if is_mounted --device "${ROOTHDD}"   if is_mounted --device "${ROOTHDD}"
    227   then   then
    # Line 542  run_install() Line 529  run_install()
    529    
    530   case "${method}" in   case "${method}" in
    531   auto)   auto)
    532     export BOOTHDD=""
    533     export SWAPHDD=""
    534     export ROOTHDD="${HDD}1"
    535   export FORMAT_FILESYSTEM_BOOTHDD=""   export FORMAT_FILESYSTEM_BOOTHDD=""
    536   export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"   export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
    537   export INSTALL_METHOD="${method}"   export INSTALL_METHOD="${method}"
    538   ;;   ;;
    539   normal)   normal)
    540     export BOOTHDD="${HDD}1"
    541     export SWAPHDD="${HDD}2"
    542     export ROOTHDD="${HDD}3"
    543   export FORMAT_FILESYSTEM_BOOTHDD="${FORMAT_FILESYSTEM}"   export FORMAT_FILESYSTEM_BOOTHDD="${FORMAT_FILESYSTEM}"
    544   export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"   export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
    545   export INSTALL_METHOD="${method}"   export INSTALL_METHOD="${method}"
    546   ;;   ;;
    547   single)   single)
    548     export BOOTHDD=""
    549     export SWAPHDD=""
    550     export ROOTHDD="${HDD}1"
    551   export FORMAT_FILESYSTEM_BOOTHDD=""   export FORMAT_FILESYSTEM_BOOTHDD=""
    552   export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"   export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
    553   export INSTALL_METHOD="${method}"   export INSTALL_METHOD="${method}"
    Legend:
    Removed from v.2885  
    changed lines
      Added in v.2886