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 2889 by niro, Fri Jul 31 10:55:16 2015 UTC
    # Line 81  trap_exit() Line 81  trap_exit()
    81   is_mounted --location "${INSTALLROOT}/sys" && umount ${INSTALLROOT}/sys   is_mounted --location "${INSTALLROOT}/sys" && umount ${INSTALLROOT}/sys
    82   is_mounted --location "${INSTALLROOT}/boot" && umount ${INSTALLROOT}/boot   is_mounted --location "${INSTALLROOT}/boot" && umount ${INSTALLROOT}/boot
    83   is_mounted --location "${INSTALLROOT}" && umount ${INSTALLROOT}   is_mounted --location "${INSTALLROOT}" && umount ${INSTALLROOT}
    84     [[ -n ${SWAPHDD} ]] && swapoff ${SWAPHDD}
    85    
    86   echo $"Installation aborted."   echo $"Installation aborted."
    87   exit 1   exit 1
    # Line 114  mount_rootfs() Line 115  mount_rootfs()
    115   then   then
    116   echo $"${INSTALLROOT} already mounted" >&2   echo $"${INSTALLROOT} already mounted" >&2
    117   else   else
    118   mount "${ROOTHDD}" "${INSTALLROOT}" || dialog_die $"Could not mount rootfs - drive '${ROOTHDD}' -> '${INSTALLROOT}'"   mount -t "${FORMAT_FILESYSTEM_ROOTHDD}" "${ROOTHDD}" "${INSTALLROOT}" || dialog_die $"Could not mount rootfs - drive '${ROOTHDD}' -> '${INSTALLROOT}'"
    119   fi   fi
    120   fi   fi
    121    
    # Line 126  mount_rootfs() Line 127  mount_rootfs()
    127   then   then
    128   echo $"${INSTALLROOT}/boot already mounted" >&2   echo $"${INSTALLROOT}/boot already mounted" >&2
    129   else   else
    130   mount "${BOOTHDD}" "${INSTALLROOT}"/boot || dialog_die $"Could not mount bootfs - drive '${BOOTHDD}' -> '${INSTALLROOT}/boot'"   mount -t "${FORMAT_FILESYSTEM_BOOTHDD}" "${BOOTHDD}" "${INSTALLROOT}"/boot || dialog_die $"Could not mount bootfs - drive '${BOOTHDD}' -> '${INSTALLROOT}/boot'"
    131   fi   fi
    132   fi   fi
    133  }  }
    # Line 222  run_hardware_detection_disks() Line 223  run_hardware_detection_disks()
    223    
    224  setup_hdd_partitions()  setup_hdd_partitions()
    225  {  {
      case "${INSTALL_METHOD}" in  
      auto)  
      BOOTHDD=""  
      SWAPHDD=""  
      ROOTHDD="${HDD}1"  
      ;;  
      normal)  
      BOOTHDD="${HDD}1"  
      SWAPHDD="${HDD}2"  
      ROOTHDD="${HDD}3"  
      ;;  
      esac  
       
    226   # sanity check - should not happen   # sanity check - should not happen
    227   if is_mounted --device "${ROOTHDD}"   if is_mounted --device "${ROOTHDD}"
    228   then   then
    # Line 542  run_install() Line 530  run_install()
    530    
    531   case "${method}" in   case "${method}" in
    532   auto)   auto)
    533     export BOOTHDD=""
    534     export SWAPHDD=""
    535     export ROOTHDD="${HDD}1"
    536   export FORMAT_FILESYSTEM_BOOTHDD=""   export FORMAT_FILESYSTEM_BOOTHDD=""
    537   export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"   export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
    538   export INSTALL_METHOD="${method}"   export INSTALL_METHOD="${method}"
    539   ;;   ;;
    540   normal)   normal)
    541     export BOOTHDD="${HDD}1"
    542     export SWAPHDD="${HDD}2"
    543     export ROOTHDD="${HDD}3"
    544   export FORMAT_FILESYSTEM_BOOTHDD="${FORMAT_FILESYSTEM}"   export FORMAT_FILESYSTEM_BOOTHDD="${FORMAT_FILESYSTEM}"
    545   export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"   export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
    546   export INSTALL_METHOD="${method}"   export INSTALL_METHOD="${method}"
    547   ;;   ;;
    548   single)   single)
    549     export BOOTHDD=""
    550     export SWAPHDD=""
    551     export ROOTHDD="${HDD}1"
    552   export FORMAT_FILESYSTEM_BOOTHDD=""   export FORMAT_FILESYSTEM_BOOTHDD=""
    553   export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"   export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
    554   export INSTALL_METHOD="${method}"   export INSTALL_METHOD="${method}"
    555   ;;   ;;
    556     flash)
    557     export BOOTHDD="${HDD}1"
    558     export SWAPHDD=""
    559     export ROOTHDD="${HDD}2"
    560     export FORMAT_FILESYSTEM_BOOTHDD="${FORMAT_FILESYSTEM}"
    561     export FORMAT_FILESYSTEM_ROOTHDD="f2fs"
    562     export INSTALL_METHOD="${method}"
    563     ;;
    564   *)   *)
    565   die "Unknown install method '${method}', aborting."   die "Unknown install method '${method}', aborting."
    566   ;;   ;;
    Legend:
    Removed from v.2885  
    changed lines
      Added in v.2889