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 6839 by niro, Thu Jul 23 12:57:23 2015 UTC revision 6840 by niro, Thu Jul 23 13:03:19 2015 UTC
    # Line 867  get_uuid() Line 867  get_uuid()
    867  install_system_settings()  install_system_settings()
    868  {  {
    869   local CONFIG   local CONFIG
    870     local fstype
    871    
    872   # write fstab   # write fstab
    873   CONFIG=${INSTALL_ROOT}/etc/fstab   CONFIG=${INSTALL_ROOT}/etc/fstab
    874   clearconfig   clearconfig
    875   if is_uuid_supported  
    876     if [[ -n ${BOOTHDD} ]]
    877   then   then
    878   if [[ -n ${BOOTHDD} ]]   if [[ ${FORMAT_FILESYSTEM} = f2fs ]]
    879   then   then
    880   addconfig -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1"   # grub/grub2 does not support boot from f2fs, use ext2 instead
    881     fstype="ext2"
    882     else
    883     fstype="${FORMAT_FILESYSTEM}"
    884   fi   fi
    885   if [[ -n ${ROOTHDD} ]]   if is_uuid_supported
    886   then   then
    887   addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0"   addconfig -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${fstype}\tnoatime,noauto\t1 1"
    888     else
    889     addconfig -e "${BOOTHDD}\t/boot\t${fstype}\tnoatime,noauto\t1 1"
    890   fi   fi
    891   else   fi
    892   if [[ -n ${BOOTHDD} ]]  
    893   then   if [[ -n ${ROOTHDD} ]]
    894   addconfig -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1"   then
    895   fi   if is_uuid_supported
      if [[ -n ${ROOTHDD} ]]  
    896   then   then
    897     addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0"
    898     else
    899   addconfig -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0"   addconfig -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0"
    900   fi   fi
    901   fi   fi
    902    
    903   # not needed busybox loads all with swapon -a, even if not mentioned in fstab   # not needed busybox loads all with swapon -a, even if not mentioned in fstab
    904   #addconfig -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0"   #addconfig -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0"
    905   addconfig -e "proc\t/proc\tproc\tdefaults\t0 0"   addconfig -e "proc\t/proc\tproc\tdefaults\t0 0"
    Legend:
    Removed from v.6839  
    changed lines
      Added in v.6840