Magellan Linux

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

    Diff of /smage/branches/alx-0_6_0/core/grub/alx/files/10_alx

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

    revision 3250 by niro, Thu Aug 11 14:46:07 2011 UTC revision 3251 by niro, Thu Sep 22 08:38:55 2011 UTC
    # Line 28  export TEXTDOMAINDIR=${prefix}/share/loc Line 28  export TEXTDOMAINDIR=${prefix}/share/loc
    28    
    29  CLASS="--class gnu-linux --class gnu --class os"  CLASS="--class gnu-linux --class gnu --class os"
    30    
    31    if [ "x${GRUB_CMDLINE_ALX_HWDETECT}" = "x" ]; then
    32     GRUB_CMDLINE_ALX_HWDETECT="splash=verbose,theme=default hardware-auto-detection"
    33    fi
    34    
    35    if [ "x${GRUB_CMDLINE_ALX_RESET}" = "x" ]; then
    36      GRUB_CMDLINE_ALX_RESET="splash=verbose,theme=default alx-reset-settings"
    37    fi
    38    
    39    if [ "x${GRUB_ALX_FB_FALLBACK}" = "x" ]; then
    40      # use vesafb instead of uvesafb, 1024x768-16@60
    41      GRUB_ALX_FB_FALLBACK="video=vesafb:mtrr:3,ywrap vga=791"
    42    fi
    43    
    44  if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then  if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
    45    OS=ALX    OS=ALX
    46  else  else
    # Line 53  fi Line 66  fi
    66    
    67  # check for special hardware  # check for special hardware
    68  if [ -x "`which hwinfo`" ]  if [ -x "`which hwinfo`" ]
    69  then  then
    70     hwinfo="`hwinfo --bios --storage --pci`"
    71    
    72   # zotac   # zotac
    73   if [ "x`hwinfo --bios --storage --pci | 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   fi   fi
    77    
    78     # rangee / VIA CLE-266 chipset
    79     if [ "x`echo ${hwinfo} | grep -i CLE266 2> /dev/null || true`" != x ]
    80     then
    81     # use fallback
    82     GRUB_CMDLINE_LINUX="${GRUB_ALX_FB_FALLBACK} ${GRUB_CMDLINE_LINUX}"
    83     fi
    84  fi  fi
    85    
    86  linux_entry ()  linux_entry ()
    # Line 185  while [ "x$list" != "x" ] ; do Line 207  while [ "x$list" != "x" ] ; do
    207    linux_entry "${OS}" "${version}" false \    linux_entry "${OS}" "${version}" false \
    208        "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"        "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
    209    
    210      linux_entry "${OS} - Re-run hardware detection" "${version}" false \
    211          "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} ${GRUB_CMDLINE_ALX_HWDETECT}"
    212    
    213      linux_entry "${OS} - Reset *all* local settings" "${version}" false \
    214          "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} ${GRUB_CMDLINE_ALX_RESET}"
    215    
    216    list=`echo $list | tr ' ' '\n' | grepvx $linux | tr '\n' ' '`    list=`echo $list | tr ' ' '\n' | grepvx $linux | tr '\n' ' '`
    217  done  done
    Legend:
    Removed from v.3250  
    changed lines
      Added in v.3251