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 3358 by niro, Tue Mar 20 14:23:25 2012 UTC revision 3453 by niro, Fri Apr 13 12:32:21 2012 UTC
    # Line 117  linux_entry () Line 117  linux_entry ()
    117    version="$2"    version="$2"
    118    recovery="$3"    recovery="$3"
    119    args="$4"    args="$4"
    120      entry_args="$5"
    121    if ${recovery} ; then    if ${recovery} ; then
    122      title="$(gettext_quoted "%s [ %s ] (recovery mode)")"      title="$(gettext_quoted "%s [ %s ] (recovery mode)")"
    123    else    else
    124      title="$(gettext_quoted "%s [ %s ]")"      title="$(gettext_quoted "%s [ %s ]")"
    125    fi    fi
    126    printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}"    printf "menuentry '${title}' ${CLASS} ${entry_args} {\n" "${os}" "${version}"
    127    if ! ${recovery} ; then    if ! ${recovery} ; then
    128        save_default_entry | sed -e "s/^/\t/"        save_default_entry | sed -e "s/^/\t/"
    129    fi    fi
    # Line 233  while [ "x$list" != "x" ] ; do Line 234  while [ "x$list" != "x" ] ; do
    234    fi    fi
    235    
    236    linux_entry "${OS}" "${version}" false \    linux_entry "${OS}" "${version}" false \
    237        "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"        "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" ""
    238    
    239    linux_entry "${OS} - Re-run hardware detection" "${version}" false \    linux_entry "${OS} - Re-run hardware detection" "${version}" false \
    240        "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} ${GRUB_CMDLINE_ALX_HWDETECT}"        "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} ${GRUB_CMDLINE_ALX_HWDETECT}" "--user alx"
    241    
    242    linux_entry "${OS} - Reset *all* local settings" "${version}" false \    linux_entry "${OS} - Reset *all* local settings" "${version}" false \
    243        "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} ${GRUB_CMDLINE_ALX_RESET}"        "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} ${GRUB_CMDLINE_ALX_RESET}" "--user alx"
    244    
    245    list=`echo $list | tr ' ' '\n' | grepvx $linux | tr '\n' ' '`    list=`echo $list | tr ' ' '\n' | grepvx $linux | tr '\n' ' '`
    246  done  done
    Legend:
    Removed from v.3358  
    changed lines
      Added in v.3453