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 2882 by niro, Fri Jul 31 09:39:45 2015 UTC revision 2888 by niro, Fri Jul 31 10:53:19 2015 UTC
    # Line 99  install_meter() Line 99  install_meter()
    99   return 0   return 0
    100  }  }
    101    
     install_mount_rootfs()  
     {  
      local opts  
       
      if [[ -n ${SWAPHDD} ]]  
      then  
      swapon ${SWAPHDD} || die  
      fi  
      if [[ -n ${ROOTHDD} ]]  
      then  
      mount -t ${FORMAT_FILESYSTEM_ROOTHDD} ${ROOTHDD} ${INSTALL_ROOT} || die  
      fi  
      if [[ -n ${BOOTHDD} ]]  
      then  
      install -d ${INSTALL_ROOT}/boot || die  
      mount -t ${FORMAT_FILESYSTEM_BOOTHDD} ${BOOTHDD} ${INSTALL_ROOT}/boot || die  
      fi  
       
      cd ${INSTALL_ROOT} || die  
     }  
       
       
    102  mount_rootfs()  mount_rootfs()
    103  {  {
    104   local retval   local retval
    # Line 136  mount_rootfs() Line 114  mount_rootfs()
    114   then   then
    115   echo $"${INSTALLROOT} already mounted" >&2   echo $"${INSTALLROOT} already mounted" >&2
    116   else   else
    117   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}'"
    118   fi   fi
    119   fi   fi
    120    
    # Line 148  mount_rootfs() Line 126  mount_rootfs()
    126   then   then
    127   echo $"${INSTALLROOT}/boot already mounted" >&2   echo $"${INSTALLROOT}/boot already mounted" >&2
    128   else   else
    129   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'"
    130   fi   fi
    131   fi   fi
    132  }  }
    # Line 244  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 337  EOF Line 302  EOF
    302    
    303  setup_hdd_format()  setup_hdd_format()
    304  {  {
    305     install -d /tmp
    306     :> /tmp/format.log
    307    
    308   if [[ -n ${SWAPHDD} ]]   if [[ -n ${SWAPHDD} ]]
    309   then   then
    310   # sanity check - should not happen   # sanity check - should not happen
    # Line 357  setup_hdd_format() Line 325  setup_hdd_format()
    325   umount "${BOOTHDD}"   umount "${BOOTHDD}"
    326   fi   fi
    327    
    328   mkfs."${FORMAT_FILESYSTEM}" -q "${BOOTHDD}" || dialog_die   mkfs."${FORMAT_FILESYSTEM_BOOTHDD}" "${BOOTHDD}" &>> /tmp/format.log || dialog_die
    329   fi   fi
    330    
    331   if [[ -n ${ROOTHDD} ]]   if [[ -n ${ROOTHDD} ]]
    # Line 369  setup_hdd_format() Line 337  setup_hdd_format()
    337   umount "${ROOTHDD}"   umount "${ROOTHDD}"
    338   fi   fi
    339    
    340   mkfs."${FORMAT_FILESYSTEM}" -q "${ROOTHDD}" || dialog_die   mkfs."${FORMAT_FILESYSTEM_ROOTHDD}" "${ROOTHDD}" &>> /tmp/format.log || dialog_die
    341   fi   fi
    342  }  }
    343    
    # Line 389  install_system_settings() Line 357  install_system_settings()
    357   clearconfig   clearconfig
    358   if [[ -n ${BOOTHDD} ]]   if [[ -n ${BOOTHDD} ]]
    359   then   then
    360   addconfig -e "UUID=$(get_uuid ${BOOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t1 1"   addconfig -e "UUID=$(get_uuid ${BOOTHDD})\t/\t${FORMAT_FILESYSTEM_BOOTHDD}\tnoatime\t1 1"
    361   fi   fi
    362   if [[ -n ${ROOTHDD} ]]   if [[ -n ${ROOTHDD} ]]
    363   then   then
    364   addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0"   addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM_ROOTHDD}\tnoatime\t0 0"
    365   fi   fi
    366   if [[ -n ${SWAPHDD} ]]   if [[ -n ${SWAPHDD} ]]
    367   then   then
    # Line 561  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=""
    536     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}"
    544     export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
    545     export INSTALL_METHOD="${method}"
    546     ;;
    547     single)
    548     export BOOTHDD=""
    549     export SWAPHDD=""
    550     export ROOTHDD="${HDD}1"
    551     export FORMAT_FILESYSTEM_BOOTHDD=""
    552     export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
    553     export INSTALL_METHOD="${method}"
    554     ;;
    555     flash)
    556     export BOOTHDD="${HDD}1"
    557     export SWAPHDD=""
    558     export ROOTHDD="${HDD}2"
    559     export FORMAT_FILESYSTEM_BOOTHDD="${FORMAT_FILESYSTEM}"
    560     export FORMAT_FILESYSTEM_ROOTHDD="f2fs"
    561   export INSTALL_METHOD="${method}"   export INSTALL_METHOD="${method}"
    562   ;;   ;;
    563   *)   *)
    Legend:
    Removed from v.2882  
    changed lines
      Added in v.2888