Ignore:
Timestamp:
03/04/14 07:18:12 (5 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0.1, releng/10.0.2
Children:
cdd74e2
Parents:
713c464
Message:

Update grub overlay data to match current 2.02 pre-release version we just pushed to
ports tree

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pc-extractoverlay/ports-overlay/usr/local/sbin/grub-mkconfig

    r9b5efbf5 r0fbe5d0  
    1818# along with GRUB.  If not, see <http://www.gnu.org/licenses/>. 
    1919 
    20 transform="s,x,x," 
    2120prefix="/usr/local" 
    22 exec_prefix="${prefix}" 
    23 datarootdir="${prefix}/share" 
     21exec_prefix="/usr/local" 
     22datarootdir="/usr/local/share" 
    2423 
    2524prefix="/usr/local" 
    26 exec_prefix="${prefix}" 
     25exec_prefix="/usr/local" 
    2726sbindir="${exec_prefix}/sbin" 
    2827bindir="${exec_prefix}/bin" 
    2928sysconfdir="${prefix}/etc" 
    3029PACKAGE_NAME=GRUB 
    31 PACKAGE_VERSION=2.00 
    32 host_os=freebsd9.1 
     30PACKAGE_VERSION=2.02~beta2 
     31host_os=freebsd10.0 
    3332datadir="${datarootdir}" 
    3433if [ "x$pkgdatadir" = x ]; then 
     
    4039self=`basename $0` 
    4140 
    42 grub_probe="${sbindir}/`echo grub-probe | sed "${transform}"`" 
    43 grub_editenv="${bindir}/`echo grub-editenv | sed "${transform}"`" 
    44 grub_script_check="${bindir}/`echo grub-script-check | sed "${transform}"`" 
     41grub_probe="${sbindir}/grub-probe" 
     42grub_file="${bindir}/grub-file" 
     43grub_editenv="${bindir}/grub-editenv" 
     44grub_script_check="${bindir}/grub-script-check" 
    4545 
    4646export TEXTDOMAIN=grub 
     
    6767 
    6868  if test $# -eq 0; then 
    69       gettext_printf "%s: option requires an argument -- \`%s'\n" "$0" "$opt" 1>&2 
     69      gettext_printf "%s: option requires an argument -- \`%s'\n" "$self" "$opt" 1>&2 
    7070      exit 1 
    7171  fi 
     
    141141GRUB_FS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2> /dev/null || echo unknown`" 
    142142 
     143if [ x"$GRUB_FS" = xunknown ]; then 
     144    GRUB_FS="$(stat -f --printf=%T / || echo unknown)" 
     145fi 
     146 
    143147if test -f ${sysconfdir}/default/grub ; then 
    144148  . ${sysconfdir}/default/grub 
     
    160164    case "x${x}" in 
    161165        xgfxterm) ;; 
    162         xconsole | xserial | xofconsole) 
     166        xconsole | xserial | xofconsole | xvga_text) 
    163167            # make sure all our children behave in conformance with ascii.. 
    164168            export LANG=C;; 
     
    188192  GRUB_HIDDEN_TIMEOUT_QUIET \ 
    189193  GRUB_TIMEOUT \ 
     194  GRUB_TIMEOUT_STYLE \ 
    190195  GRUB_DEFAULT_BUTTON \ 
    191196  GRUB_HIDDEN_TIMEOUT_BUTTON \ 
    192197  GRUB_TIMEOUT_BUTTON \ 
     198  GRUB_TIMEOUT_STYLE_BUTTON \ 
    193199  GRUB_BUTTON_CMOS_ADDRESS \ 
    194200  GRUB_BUTTON_CMOS_CLEAN \ 
     
    217223  GRUB_SAVEDEFAULT \ 
    218224  GRUB_ENABLE_CRYPTODISK \ 
    219   GRUB_BADRAM 
     225  GRUB_BADRAM \ 
     226  GRUB_OS_PROBER_SKIP_LIST \ 
     227  GRUB_DISABLE_SUBMENU 
    220228 
    221229if test "x${grub_cfg}" != "x"; then 
     
    225233  umask $oldumask 
    226234fi 
    227 gettext "Generating grub.cfg ..." >&2 
     235gettext "Generating grub configuration file ..." >&2 
    228236echo >&2 
    229237 
     
    237245EOF 
    238246 
    239 for i in ${grub_mkconfig_dir}/* ; do 
     247 
     248for i in "${grub_mkconfig_dir}"/* ; do 
    240249  case "$i" in 
    241250    # emacsen backup files. FIXME: support other editors 
    242251    *~) ;; 
    243252    # emacsen autosave files. FIXME: support other editors 
    244     \#*\#) ;; 
     253    */\#*\#) ;; 
    245254    *) 
    246255      if grub_file_is_not_garbage "$i" && test -x "$i" ; then 
     
    261270and /etc/grub.d/* files or please file a bug report with 
    262271%s file attached." "${grub_cfg}.new" >&2 
     272    echo >&2 
    263273  else 
    264274    # none of the children aborted with error, install the new grub.cfg 
Note: See TracChangeset for help on using the changeset viewer.