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 5574 by niro, Wed Aug 7 11:10:32 2013 UTC revision 5575 by niro, Tue Apr 22 10:55:06 2014 UTC
    # Line 37  KERNELOPTS="quiet video=1024x768" Line 37  KERNELOPTS="quiet video=1024x768"
    37  # grub options  # grub options
    38  GRUBLEGACYOPTS=""  GRUBLEGACYOPTS=""
    39  GRUB2OPTS=""  GRUB2OPTS=""
    40    GRUB2GFXPAYLOAD="1024x768x16,1024x768"
    41    
    42  # fdisk options  # fdisk options
    43  FDISKPARTIONBELOW256MB=0  FDISKPARTIONBELOW256MB=0
    # Line 210  dialog_hardware_detection() Line 211  dialog_hardware_detection()
    211   zotac*) echo " \n\n\n \\Z2Zotac Device erkannt.\\Zn \\" >> ${hwtmp} ;;   zotac*) echo " \n\n\n \\Z2Zotac Device erkannt.\\Zn \\" >> ${hwtmp} ;;
    212   rangee) echo " \n\n\n \\Z2Rangee Device erkannt.\\Zn \\" >> ${hwtmp} ;;   rangee) echo " \n\n\n \\Z2Rangee Device erkannt.\\Zn \\" >> ${hwtmp} ;;
    213   maxdata) echo " \n\n\n \\Z2Maxdata Device erkannt.\\Zn \\" >> ${hwtmp} ;;   maxdata) echo " \n\n\n \\Z2Maxdata Device erkannt.\\Zn \\" >> ${hwtmp} ;;
    214     i845) echo " \n\n\n \\Z2Intel i845 Device erkannt.\\Zn \\" >> ${hwtmp} ;;
    215   *) echo " \n\n\n \\ZnStandard Device erkannt.\\Zn \\" >> ${hwtmp} ;;   *) echo " \n\n\n \\ZnStandard Device erkannt.\\Zn \\" >> ${hwtmp} ;;
    216   esac   esac
    217   if [[ ${FORMFACTOR} = laptop ]]   if [[ ${FORMFACTOR} = laptop ]]
    # Line 464  run_hardware_detection() Line 466  run_hardware_detection()
    466    
    467   # only add this for grub legacy, grub2 detect these settings on its own   # only add this for grub legacy, grub2 detect these settings on its own
    468   export GRUBLEGACYOPTS="rootdelay=8"   export GRUBLEGACYOPTS="rootdelay=8"
    469   # there are to zotac types in the wild, nvidia based gfx and intel   # there are two zotac types in the wild, nvidia based gfx and intel
    470   if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]   if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]
    471   then   then
    472   export SPECIALDEVICE="zotac_nvidia"   export SPECIALDEVICE="zotac_nvidia"
    # Line 491  run_hardware_detection() Line 493  run_hardware_detection()
    493   export GRUBLEGACYOPTS=""   export GRUBLEGACYOPTS=""
    494   fi   fi
    495    
    496     # check for i845 Chipsets and disable KMS and use 915 drm driver
    497     if [[ ! -z $(echo "${hwinfo}" | grep -i i845) ]]
    498     then
    499     export SPECIALDEVICE="i845"
    500     # unset default video=1024x768 opt or the drm driver breaks
    501     export KERNELOPTS="quiet"
    502     export GRUBLEGACYOPTS=""
    503     # enable full kms support
    504     export GRUB2GFXPAYLOAD="keep"
    505     fi
    506    
    507   # check for special devices/clients:   # check for special devices/clients:
    508   # check for laptops and activate cpufreq scaling   # check for laptops and activate cpufreq scaling
    509   if [[ $(echo "${hwinfo}" | grep 'Formfactor:' | sed 's:.*Formfactor\:\ \"\(.*\)\":\1:') = laptop ]]   if [[ $(echo "${hwinfo}" | grep 'Formfactor:' | sed 's:.*Formfactor\:\ \"\(.*\)\":\1:') = laptop ]]
    # Line 650  install_bootsector_chroot() Line 663  install_bootsector_chroot()
    663   if [[ -f ${INSTALLPATH}/etc/conf.d/grub ]]   if [[ -f ${INSTALLPATH}/etc/conf.d/grub ]]
    664   then   then
    665   sed -i "s:^\(export GRUB_CMDLINE_LINUX_DEFAULT=\).*:\1\"${KERNELOPTS}\":" ${INSTALLPATH}/etc/conf.d/grub || die   sed -i "s:^\(export GRUB_CMDLINE_LINUX_DEFAULT=\).*:\1\"${KERNELOPTS}\":" ${INSTALLPATH}/etc/conf.d/grub || die
    666     sed -i "s:^\(export GRUB_GFXPAYLOAD_LINUX=\).*:\1\"${GRUB2GFXPAYLOAD}\":" ${INSTALLPATH}/etc/conf.d/grub || die
    667   else   else
    668   echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLPATH}/etc/conf.d/grub || die   echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLPATH}/etc/conf.d/grub || die
    669     echo "export GRUB_GFXPAYLOAD_LINUX=\"${GRUB2GFXPAYLOAD}\"" >>  ${INSTALLPATH}/etc/conf.d/grub || die
    670   fi   fi
    671   echo 'grub-mkdevicemap' > ${INSTALLPATH}/root/.installrc || die   echo 'grub-mkdevicemap' > ${INSTALLPATH}/root/.installrc || die
    672   echo "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null" >> ${INSTALLPATH}/root/.installrc || die   echo "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null" >> ${INSTALLPATH}/root/.installrc || die
    # Line 762  install_initrd_chroot() Line 777  install_initrd_chroot()
    777   DRMMODS="i915 mga nouveau r128 radeon savage sis tdfx ttm via"   DRMMODS="i915 mga nouveau r128 radeon savage sis tdfx ttm via"
    778   OTHERMODS=""   OTHERMODS=""
    779   case ${SPECIALDEVICE} in   case ${SPECIALDEVICE} in
    780   zotac_intel) FBMODS=""; DRMMODS="i915" ;;   zotac_intel|i845) FBMODS=""; DRMMODS="i915" ;;
    781   zotac_nvidia) FBMODS=""; DRMMODS="nouveau" ;;   zotac_nvidia) FBMODS=""; DRMMODS="nouveau" ;;
    782   rangee) FBMODS="" ;; ## fallback to vesafb, viafb does not run on all CLE266 boards   rangee) FBMODS="" ;; ## fallback to vesafb, viafb does not run on all CLE266 boards
    783   # not working with kms enabled drivers -> segfaults   # not working with kms enabled drivers -> segfaults
    Legend:
    Removed from v.5574  
    changed lines
      Added in v.5575