Magellan Linux

  • Back to homepage
    • /[alx-svn]/alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in

    Diff of /alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 6840 by niro, Thu Jul 23 13:03:19 2015 UTC revision 6841 by niro, Thu Jul 23 13:20:43 2015 UTC
    # Line 44  GRUB2OPTS="" Line 44  GRUB2OPTS=""
    44  GRUB2GFXPAYLOAD=""  GRUB2GFXPAYLOAD=""
    45  FORMFACTOR=""  FORMFACTOR=""
    46  FORMAT_FILESYSTEM=""  FORMAT_FILESYSTEM=""
    47    FORMAT_FILESYSTEM_BOOTHDD=""
    48    FORMAT_FILESYSTEM_ROOTHDD=""
    49  FDISKPARTIONBELOW256MB=0  FDISKPARTIONBELOW256MB=0
    50  SPECIALDEVICE=""  SPECIALDEVICE=""
    51  FLASHDISK=0  FLASHDISK=0
    # Line 594  setup_hdd_format() Line 596  setup_hdd_format()
    596   fi   fi
    597   if [[ -n ${BOOTHDD} ]]   if [[ -n ${BOOTHDD} ]]
    598   then   then
    599   # f2fs is not grub/grub2 compatible   mkfs.${FORMAT_FILESYSTEM_BOOTHDD} -q ${BOOTHDD} || die
      if [[ ${FORMAT_FILESYSTEM} = f2fs ]]  
      then  
      mkfs.ext2 -q ${BOOTHDD} || die  
      else  
      mkfs.${FORMAT_FILESYSTEM} -q ${BOOTHDD} || die  
      fi  
    600   fi   fi
    601   if [[ -n ${ROOTHDD} ]]   if [[ -n ${ROOTHDD} ]]
    602   then   then
    603   mkfs.${FORMAT_FILESYSTEM} -q ${ROOTHDD} || die   mkfs.${FORMAT_FILESYSTEM_ROOTHDD} -q ${ROOTHDD} || die
    604   fi   fi
    605  }  }
    606    
    # Line 618  install_mount_rootfs() Line 614  install_mount_rootfs()
    614   fi   fi
    615   if [[ -n ${ROOTHDD} ]]   if [[ -n ${ROOTHDD} ]]
    616   then   then
    617   # be safe here, append file system type to mount   mount -t ${FORMAT_FILESYSTEM_ROOTHDD} ${ROOTHDD} ${INSTALL_ROOT} || die
      # just in case the f2fs module was not autoloaded  
      [[ ${FORMAT_FILESYSTEM} = f2fs ]] && opts="-t fs2fs"  
      mount ${opts} ${ROOTHDD} ${INSTALL_ROOT} || die  
    618   fi   fi
    619   if [[ -n ${BOOTHDD} ]]   if [[ -n ${BOOTHDD} ]]
    620   then   then
    621   install -d ${INSTALL_ROOT}/boot || die   install -d ${INSTALL_ROOT}/boot || die
    622   mount ${BOOTHDD} ${INSTALL_ROOT}/boot || die   mount -t ${FORMAT_FILESYSTEM_BOOTHDD} ${BOOTHDD} ${INSTALL_ROOT}/boot || die
    623   fi   fi
    624    
    625   cd ${INSTALL_ROOT} || die   cd ${INSTALL_ROOT} || die
    # Line 761  install_initrd_chroot() Line 754  install_initrd_chroot()
    754   # only generate initrds if the cmd exists   # only generate initrds if the cmd exists
    755   is_initrd_supported || return 0   is_initrd_supported || return 0
    756    
    757   FSMODS="${FORMAT_FILESYSTEM}"   FSMODS="${FORMAT_FILESYSTEM_BOOTHDD} ${FORMAT_FILESYSTEM_ROOTHDD}"
    758   DISKMODS="sd_mod"   DISKMODS="sd_mod"
    759   OLDPATAMODS="amd74xx piix sis5513 via82cxxx"   OLDPATAMODS="amd74xx piix sis5513 via82cxxx"
    760   PATAMODS="ata_piix pata_amd pata_mpiix pata_oldpiix pata_sis pata_via"   PATAMODS="ata_piix pata_amd pata_mpiix pata_oldpiix pata_sis pata_via"
    # Line 778  install_initrd_chroot() Line 771  install_initrd_chroot()
    771   *) FBMODS="uvesafb" ;;   *) FBMODS="uvesafb" ;;
    772   esac   esac
    773    
      # add a filesystems recoqnized by the bootloader if the current ${FORMAT_FILESYSTEM} is not supported  
      case "${FORMAT_FILESYSTEM}" in  
      f2fs) FSMODS+=" ext2" ;;  
      esac  
       
    774   if [[ ${FORMFACTOR} = laptop ]]   if [[ ${FORMFACTOR} = laptop ]]
    775   then   then
    776   OTHERMODS="acpi-cpufreq cpufreq_ondemand cpufreq_conservative cpufreq_powersave"   OTHERMODS="acpi-cpufreq cpufreq_ondemand cpufreq_conservative cpufreq_powersave"
    # Line 875  install_system_settings() Line 863  install_system_settings()
    863    
    864   if [[ -n ${BOOTHDD} ]]   if [[ -n ${BOOTHDD} ]]
    865   then   then
      if [[ ${FORMAT_FILESYSTEM} = f2fs ]]  
      then  
      # grub/grub2 does not support boot from f2fs, use ext2 instead  
      fstype="ext2"  
      else  
      fstype="${FORMAT_FILESYSTEM}"  
      fi  
    866   if is_uuid_supported   if is_uuid_supported
    867   then   then
    868   addconfig -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${fstype}\tnoatime,noauto\t1 1"   addconfig -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM_BOOTHDD}\tnoatime,noauto\t1 1"
    869   else   else
    870   addconfig -e "${BOOTHDD}\t/boot\t${fstype}\tnoatime,noauto\t1 1"   addconfig -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM_BOOTHDD}\tnoatime,noauto\t1 1"
    871   fi   fi
    872   fi   fi
    873    
    # Line 894  install_system_settings() Line 875  install_system_settings()
    875   then   then
    876   if is_uuid_supported   if is_uuid_supported
    877   then   then
    878   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"
    879   else   else
    880   addconfig -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0"   addconfig -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM_ROOTHDD}\tnoatime\t0 0"
    881   fi   fi
    882   fi   fi
    883    
    # Line 962  run_install() Line 943  run_install()
    943    
    944   case "${method}" in   case "${method}" in
    945   auto)   auto)
    946     export FORMAT_FILESYSTEM_BOOTHDD=""
    947     export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
    948   export INSTALL_METHOD="${method}"   export INSTALL_METHOD="${method}"
    949   ;;   ;;
    950   normal)   normal)
    951     export FORMAT_FILESYSTEM_BOOTHDD="${FORMAT_FILESYSTEM}"
    952     export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
    953   export INSTALL_METHOD="${method}"   export INSTALL_METHOD="${method}"
    954   ;;   ;;
    955   single)   single)
    956     export FORMAT_FILESYSTEM_BOOTHDD=""
    957     export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
    958   export INSTALL_METHOD="${method}"   export INSTALL_METHOD="${method}"
    959   ;;   ;;
    960   flash)   flash)
    961   export FORMAT_FILESYSTEM="f2fs"   export FORMAT_FILESYSTEM="f2fs"
    962     export FORMAT_FILESYSTEM_BOOTHDD="ext2"
    963     export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
    964   export INSTALL_METHOD="${method}"   export INSTALL_METHOD="${method}"
    965   ;;   ;;
    966   *)   *)
    Legend:
    Removed from v.6840  
    changed lines
      Added in v.6841