Changeset 0fbe5d0


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

Location:
src-sh/pc-extractoverlay/ports-overlay/usr/local
Files:
2 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 
  • src-sh/pc-extractoverlay/ports-overlay/usr/local/share/grub/grub-mkconfig_lib

    rc297e38 r0fbe5d0  
    1515# along with GRUB.  If not, see <http://www.gnu.org/licenses/>. 
    1616 
    17 transform="s,x,x," 
    18  
    1917prefix="/usr/local" 
    20 exec_prefix="${prefix}" 
    21 datarootdir="${prefix}/share" 
     18exec_prefix="/usr/local" 
     19datarootdir="/usr/local/share" 
    2220datadir="${datarootdir}" 
    2321bindir="${exec_prefix}/bin" 
    2422sbindir="${exec_prefix}/sbin" 
    25 pkgdatadir="${datadir}/grub" 
     23if [ "x$pkgdatadir" = x ]; then 
     24    pkgdatadir="${datadir}/grub" 
     25fi 
    2626 
    2727if test "x$grub_probe" = x; then 
    28   grub_probe="${sbindir}/`echo grub-probe | sed "${transform}"`" 
     28  grub_probe="${sbindir}/grub-probe" 
     29fi 
     30if test "x$grub_file" = x; then 
     31  grub_file="${bindir}/grub-file" 
    2932fi 
    3033if test "x$grub_mkrelpath" = x; then 
    31   grub_mkrelpath="${bindir}/`echo grub-mkrelpath | sed "${transform}"`" 
     34  grub_mkrelpath="${bindir}/grub-mkrelpath" 
    3235fi 
    3336 
     
    6669  # ... or if we can't figure out the abstraction module, for example if 
    6770  # memberlist fails on an LVM volume group. 
    68   if abstractions="`"${grub_probe}" -t abstraction "$path"`" 2>&1 ; then  
     71  if abstractions="`"${grub_probe}" -t abstraction "$path"`" 2> /dev/null ; then  
    6972      : 
    7073  else 
     
    7275  fi 
    7376 
    74   if [ x$GRUB_CRYPTODISK_ENABLE = xy ]; then 
     77  if [ x$GRUB_ENABLE_CRYPTODISK = xy ]; then 
    7578      return 0 
    7679  fi 
     
    118121prepare_grub_to_access_device () 
    119122{ 
    120   device="$1" 
    121  
    122   partmap="`"${grub_probe}" --device "${device}" --target=partmap`" 
     123  old_ifs="$IFS" 
     124  IFS=' 
     125' 
     126  partmap="`"${grub_probe}" --device $@ --target=partmap`" 
    123127  for module in ${partmap} ; do 
    124128    case "${module}" in 
     
    131135 
    132136  # Abstraction modules aren't auto-loaded. 
    133   abstraction="`"${grub_probe}" --device "${device}" --target=abstraction`" 
     137  abstraction="`"${grub_probe}" --device $@ --target=abstraction`" 
    134138  for module in ${abstraction} ; do 
    135139    echo "insmod ${module}" 
    136140  done 
    137    
     141 
    138142  # KPM - 6-24-2013 
    139143  # Add this work-around since GRUB doesn't like to identify ZFS 
     
    144148     fs="zfs" 
    145149  else 
    146     fs="`"${grub_probe}" --device "${device}" --target=fs`" 
    147   fi 
     150     fs="`"${grub_probe}" --device $@ --target=fs`" 
     151  fi 
     152 
    148153  for module in ${fs} ; do 
    149154    echo "insmod ${module}" 
    150155  done 
    151156 
    152   if [ x$GRUB_CRYPTODISK_ENABLE = xy ]; then 
    153       for uuid in "`"${grub_probe}" --device "${device}" --target=cryptodisk_uuid`"; do 
     157  if [ x$GRUB_ENABLE_CRYPTODISK = xy ]; then 
     158      for uuid in "`"${grub_probe}" --device $@ --target=cryptodisk_uuid`"; do 
    154159          echo "cryptomount -u $uuid" 
    155160      done 
     
    158163  # If there's a filesystem UUID that GRUB is capable of identifying, use it; 
    159164  # otherwise set root as per value in device.map. 
    160   fs_hint="`"${grub_probe}" --device "${device}" --target=compatibility_hint`" 
     165  fs_hint="`"${grub_probe}" --device $@ --target=compatibility_hint`" 
    161166  if [ "x$fs_hint" != x ]; then 
    162167    echo "set root='$fs_hint'" 
    163168  fi 
    164   if fs_uuid="`"${grub_probe}" --device "${device}" --target=fs_uuid 2> /dev/null`" ; then 
    165     hints="`"${grub_probe}" --device "${device}" --target=hints_string 2> /dev/null`" || hints= 
     169  if fs_uuid="`"${grub_probe}" --device $@ --target=fs_uuid 2> /dev/null`" ; then 
     170    hints="`"${grub_probe}" --device $@ --target=hints_string 2> /dev/null`" || hints= 
    166171    echo "if [ x\$feature_platform_search_hint = xy ]; then" 
    167172    echo "  search --no-floppy --fs-uuid --set=root ${hints} ${fs_uuid}" 
     
    170175    echo "fi" 
    171176  fi 
     177  IFS="$old_ifs" 
    172178} 
    173179 
    174180grub_get_device_id () 
    175181{ 
     182  old_ifs="$IFS" 
     183  IFS=' 
     184' 
    176185  device="$1" 
    177   if fs_uuid="`"${grub_probe}" --device "${device}" --target=fs_uuid 2> /dev/null`" ; then 
     186  if fs_uuid="`"${grub_probe}" --device ${device} --target=fs_uuid 2> /dev/null`" ; then 
    178187    echo "$fs_uuid"; 
    179188  else 
    180     echo "$device" 
    181   fi 
     189    echo $device |sed 's, ,_,g' 
     190  fi 
     191  IFS="$old_ifs" 
    182192} 
    183193 
     
    265275} 
    266276 
    267 # One layer of quotation is eaten by "", the second by sed, and the third by 
    268 # printf; so this turns ' into \'.  Note that you must use the output of 
    269 # this function in a printf format string. 
    270  
     277# One layer of quotation is eaten by "" and the second by sed; so this turns 
     278# ' into \'. 
    271279grub_quote () { 
    272   sed "s/'/'\\\\\\\\''/g" 
     280  sed "s/'/'\\\\''/g" 
    273281} 
    274282 
    275283gettext_quoted () { 
    276   gettext "$@" | sed "s/'/'\\\\\\\\''/g" 
    277 } 
    278  
    279 # Run the first argument through gettext_quoted, and then pass that and all 
     284  gettext "$@" | grub_quote 
     285} 
     286 
     287# Run the first argument through gettext, and then pass that and all 
    280288# remaining arguments to printf.  This is a useful abbreviation and tends to 
    281289# be easier to type. 
     
    288296uses_abstraction () { 
    289297  device="$1" 
    290  
    291   abstraction="`"${grub_probe}" --device "${device}" --target=abstraction`" 
     298  old_ifs="$IFS" 
     299  IFS=' 
     300' 
     301 
     302  abstraction="`"${grub_probe}" --device ${device} --target=abstraction`" 
    292303  for module in ${abstraction}; do 
    293304    if test "x${module}" = "x$2"; then 
     305      IFS="$old_ifs" 
    294306      return 0 
    295307    fi 
    296308  done 
     309  IFS="$old_ifs" 
    297310  return 1 
    298311} 
     
    359372  fi 
    360373} 
     374 
     375grub_tab="      " 
     376 
     377grub_add_tab () { 
     378  sed -e "s/^/$grub_tab/" 
     379} 
     380 
Note: See TracChangeset for help on using the changeset viewer.