Magellan Linux

  • Back to homepage
    • /[alx-svn]/smage/trunk/core/grub/alx/files/10_alx

    Diff of /smage/trunk/core/grub/alx/files/10_alx

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

    revision 3586 by niro, Thu Sep 22 08:42:35 2011 UTC revision 3587 by niro, Mon Jul 9 18:45:45 2012 UTC
    # Line 73  then Line 73  then
    73   if [ "x`echo ${hwinfo} | grep -i zotac 2> /dev/null || true`" != x ]   if [ "x`echo ${hwinfo} | grep -i zotac 2> /dev/null || true`" != x ]
    74   then   then
    75   GRUB_CMDLINE_LINUX="rootdelay=8 ${GRUB_CMDLINE_LINUX}"   GRUB_CMDLINE_LINUX="rootdelay=8 ${GRUB_CMDLINE_LINUX}"
    76     # use noop scheduler on flash memory drivers for better i/o perfomance
    77     GRUB_CMDLINE_LINUX="elevator=noop ${GRUB_CMDLINE_LINUX}"
    78   fi   fi
    79    
    80   # rangee / VIA CLE-266 chipset   # rangee / VIA CLE-266 chipset
    # Line 80  then Line 82  then
    82   then   then
    83   # use fallback   # use fallback
    84   GRUB_CMDLINE_LINUX="${GRUB_ALX_FB_FALLBACK} ${GRUB_CMDLINE_LINUX}"   GRUB_CMDLINE_LINUX="${GRUB_ALX_FB_FALLBACK} ${GRUB_CMDLINE_LINUX}"
    85     # use noop scheduler on flash memory drivers for better i/o perfomance
    86     GRUB_CMDLINE_LINUX="elevator=noop ${GRUB_CMDLINE_LINUX}"
    87     fi
    88    
    89     # maxdata / Intel i810 / i815 chipset
    90     if [ "x`echo ${hwinfo} | grep -i i810 2> /dev/null || true`" != x ]
    91     then
    92     # disable KMS
    93     GRUB_CMDLINE_LINUX="nomodeset ${GRUB_CMDLINE_LINUX}"
    94     fi
    95     if [ "x`echo ${hwinfo} | grep -i i815 2> /dev/null || true`" != x ]
    96     then
    97     # disable KMS
    98     GRUB_CMDLINE_LINUX="nomodeset ${GRUB_CMDLINE_LINUX}"
    99     fi
    100    
    101     # disable bootsplash for i845, which must have kms, but fbmode is not supported with kms
    102     if [ "x`echo ${hwinfo} | grep -i i845 2> /dev/null || true`" != x ]
    103     then
    104     GRUB_CMDLINE_LINUX="splash=verbose,theme=default ${GRUB_CMDLINE_LINUX}"
    105     fi
    106    
    107     # disable KMS for Radeon RV250
    108     if [ "x`echo ${hwinfo} | grep -i rv250 2> /dev/null || true`" != x ]
    109     then
    110     GRUB_CMDLINE_LINUX="nomodeset ${GRUB_CMDLINE_LINUX}"
    111     fi
    112    fi
    113    # check for kms
    114    if [ -e /proc/fb ]
    115    then
    116     if [ x"`grep inteldrmfb /proc/fb`" != "x" ]
    117     then
    118     # unset framebuffer, use KMS
    119     export GRUB_GFXPAYLOAD_LINUX=""
    120     elif [ x"`grep radeondrmfb /proc/fb`" != "x" ]
    121     then
    122     # unset framebuffer, use KMS
    123     export GRUB_GFXPAYLOAD_LINUX=""
    124     elif [ x"`grep nouveaufb /proc/fb`" != "x" ]
    125     then
    126     # unset framebuffer, use KMS
    127     export GRUB_GFXPAYLOAD_LINUX=""
    128   fi   fi
    129  fi  fi
    130    
    # Line 89  linux_entry () Line 134  linux_entry ()
    134    version="$2"    version="$2"
    135    recovery="$3"    recovery="$3"
    136    args="$4"    args="$4"
    137      entry_args="$5"
    138    if ${recovery} ; then    if ${recovery} ; then
    139      title="$(gettext_quoted "%s [ %s ] (recovery mode)")"      title="$(gettext_quoted "%s [ %s ] (recovery mode)")"
    140    else    else
    141      title="$(gettext_quoted "%s [ %s ]")"      title="$(gettext_quoted "%s [ %s ]")"
    142    fi    fi
    143    printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}"    printf "menuentry '${title}' ${CLASS} ${entry_args} {\n" "${os}" "${version}"
    144    if ! ${recovery} ; then    if ! ${recovery} ; then
    145        save_default_entry | sed -e "s/^/\t/"        save_default_entry | sed -e "s/^/\t/"
    146    fi    fi
    # Line 205  while [ "x$list" != "x" ] ; do Line 251  while [ "x$list" != "x" ] ; do
    251    fi    fi
    252    
    253    linux_entry "${OS}" "${version}" false \    linux_entry "${OS}" "${version}" false \
    254        "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"        "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" ""
    255    
    256    linux_entry "${OS} - Re-run hardware detection" "${version}" false \    linux_entry "${OS} - Re-run hardware detection" "${version}" false \
    257        "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} ${GRUB_CMDLINE_ALX_HWDETECT}"        "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} ${GRUB_CMDLINE_ALX_HWDETECT}" "--users alx"
    258    
    259    linux_entry "${OS} - Reset *all* local settings" "${version}" false \    linux_entry "${OS} - Reset *all* local settings" "${version}" false \
    260        "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} ${GRUB_CMDLINE_ALX_RESET}"        "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} ${GRUB_CMDLINE_ALX_RESET}" "--users alx"
    261    
    262    list=`echo $list | tr ' ' '\n' | grepvx $linux | tr '\n' ' '`    list=`echo $list | tr ' ' '\n' | grepvx $linux | tr '\n' ' '`
    263  done  done
    Legend:
    Removed from v.3586  
    changed lines
      Added in v.3587