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 2937 by niro, Wed Feb 3 13:57:02 2016 UTC revision 2942 by niro, Mon Jun 13 12:29:59 2016 UTC
    # Line 616  task_hardware_detection() Line 616  task_hardware_detection()
    616   if [[ ${FLASHDISK} = 1 ]]   if [[ ${FLASHDISK} = 1 ]]
    617   then   then
    618   message+=$"\n\ZnFlash memory detected.\Zn"   message+=$"\n\ZnFlash memory detected.\Zn"
    619   message+=$"\n\ZnF2FS will be used as default filesystem withn the auto installation mode.\Zn"   message+=$"\n\ZnF2FS will be used as default filesystem within the auto installation mode.\Zn"
    620   fi   fi
    621    
    622   messagebox -y 12 -h $"Detected hardware:" "${message}"   messagebox -y 12 -h $"Detected hardware:" "${message}"
    # Line 683  run_install() Line 683  run_install()
    683   export BOOTHDD="${HDD}1"   export BOOTHDD="${HDD}1"
    684   export SWAPHDD=""   export SWAPHDD=""
    685   export ROOTHDD="${HDD}2"   export ROOTHDD="${HDD}2"
    686   export FORMAT_FILESYSTEM_BOOTHDD="f2fs"   export FORMAT_FILESYSTEM_BOOTHDD="ext2"
    687   export FORMAT_FILESYSTEM_ROOTHDD="ext2"   export FORMAT_FILESYSTEM_ROOTHDD="f2fs"
    688   else   else
    689   export BOOTHDD=""   # ext4 seems not to be compatible again
    690   export SWAPHDD=""   if [[ ${FORMAT_FILESYSTEM} = ext4 ]]
    691   export ROOTHDD="${HDD}1"   then
    692   export FORMAT_FILESYSTEM_BOOTHDD=""   export BOOTHDD="${HDD}1"
    693   export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"   export SWAPHDD=""
    694     export ROOTHDD="${HDD}2"
    695     export FORMAT_FILESYSTEM_BOOTHDD="ext2"
    696     export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
    697     else
    698     export BOOTHDD=""
    699     export SWAPHDD=""
    700     export ROOTHDD="${HDD}1"
    701     export FORMAT_FILESYSTEM_BOOTHDD=""
    702     export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
    703     fi
    704   fi   fi
    705   export INSTALL_METHOD="${method}"   export INSTALL_METHOD="${method}"
    706   ;;   ;;
    # Line 714  run_install() Line 724  run_install()
    724   export BOOTHDD="${HDD}1"   export BOOTHDD="${HDD}1"
    725   export SWAPHDD=""   export SWAPHDD=""
    726   export ROOTHDD="${HDD}2"   export ROOTHDD="${HDD}2"
    727   export FORMAT_FILESYSTEM_BOOTHDD="${FORMAT_FILESYSTEM}"   export FORMAT_FILESYSTEM_BOOTHDD="ext2"
    728   export FORMAT_FILESYSTEM_ROOTHDD="f2fs"   export FORMAT_FILESYSTEM_ROOTHDD="f2fs"
    729   export INSTALL_METHOD="${method}"   export INSTALL_METHOD="${method}"
    730   ;;   ;;
    Legend:
    Removed from v.2937  
    changed lines
      Added in v.2942