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 2883 by niro, Fri Jul 31 09:42:12 2015 UTC revision 2885 by niro, Fri Jul 31 10:09:08 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 360  setup_hdd_format() Line 338  setup_hdd_format()
    338   umount "${BOOTHDD}"   umount "${BOOTHDD}"
    339   fi   fi
    340    
    341   mkfs."${FORMAT_FILESYSTEM}" "${BOOTHDD}" &>> /tmp/format.log || dialog_die   mkfs."${FORMAT_FILESYSTEM_BOOTHDD}" "${BOOTHDD}" &>> /tmp/format.log || dialog_die
    342   fi   fi
    343    
    344   if [[ -n ${ROOTHDD} ]]   if [[ -n ${ROOTHDD} ]]
    # Line 372  setup_hdd_format() Line 350  setup_hdd_format()
    350   umount "${ROOTHDD}"   umount "${ROOTHDD}"
    351   fi   fi
    352    
    353   mkfs."${FORMAT_FILESYSTEM}" "${ROOTHDD}" &>> /tmp/format.log || dialog_die   mkfs."${FORMAT_FILESYSTEM_ROOTHDD}" "${ROOTHDD}" &>> /tmp/format.log || dialog_die
    354   fi   fi
    355  }  }
    356    
    # Line 392  install_system_settings() Line 370  install_system_settings()
    370   clearconfig   clearconfig
    371   if [[ -n ${BOOTHDD} ]]   if [[ -n ${BOOTHDD} ]]
    372   then   then
    373   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"
    374   fi   fi
    375   if [[ -n ${ROOTHDD} ]]   if [[ -n ${ROOTHDD} ]]
    376   then   then
    377   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"
    378   fi   fi
    379   if [[ -n ${SWAPHDD} ]]   if [[ -n ${SWAPHDD} ]]
    380   then   then
    # Line 564  run_install() Line 542  run_install()
    542    
    543   case "${method}" in   case "${method}" in
    544   auto)   auto)
    545     export FORMAT_FILESYSTEM_BOOTHDD=""
    546     export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
    547   export INSTALL_METHOD="${method}"   export INSTALL_METHOD="${method}"
    548   ;;   ;;
    549   normal)   normal)
    550     export FORMAT_FILESYSTEM_BOOTHDD="${FORMAT_FILESYSTEM}"
    551     export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
    552     export INSTALL_METHOD="${method}"
    553     ;;
    554     single)
    555     export FORMAT_FILESYSTEM_BOOTHDD=""
    556     export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
    557   export INSTALL_METHOD="${method}"   export INSTALL_METHOD="${method}"
    558   ;;   ;;
    559   *)   *)
    Legend:
    Removed from v.2883  
    changed lines
      Added in v.2885