Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 364763 | Differences between
and this patch

Collapse All | Expand All

(-)grub-1.99~rc1/docs/grub.info (-3 / +3 lines)
Lines 948-954 Link Here
948
upgrading a distribution, and will discover available kernels and
948
upgrading a distribution, and will discover available kernels and
949
attempt to generate menu entries for them.
949
attempt to generate menu entries for them.
950
950
951
   The file `/etc/default/grub' controls the operation of
951
   The file `/etc/conf.d/grub' controls the operation of
952
`grub-mkconfig'.  It is sourced by a shell script, and so must be valid
952
`grub-mkconfig'.  It is sourced by a shell script, and so must be valid
953
POSIX shell input; normally, it will just be a sequence of `KEY=value'
953
POSIX shell input; normally, it will just be a sequence of `KEY=value'
954
lines, but if the value contains spaces or other special characters
954
lines, but if the value contains spaces or other special characters
Lines 956-962 Link Here
956
956
957
     GRUB_TERMINAL_INPUT="console serial"
957
     GRUB_TERMINAL_INPUT="console serial"
958
958
959
   Valid keys in `/etc/default/grub' are as follows:
959
   Valid keys in `/etc/conf.d/grub' are as follows:
960
960
961
`GRUB_DEFAULT'
961
`GRUB_DEFAULT'
962
     The default menu entry.  This may be a number, in which case it
962
     The default menu entry.  This may be a number, in which case it
Lines 1967-1973 Link Here
1967
Some laptop vendors provide an additional power-on button which boots
1967
Some laptop vendors provide an additional power-on button which boots
1968
another OS.  GRUB supports such buttons with the `GRUB_TIMEOUT_BUTTON',
1968
another OS.  GRUB supports such buttons with the `GRUB_TIMEOUT_BUTTON',
1969
`GRUB_DEFAULT_BUTTON', `GRUB_HIDDEN_TIMEOUT_BUTTON' and
1969
`GRUB_DEFAULT_BUTTON', `GRUB_HIDDEN_TIMEOUT_BUTTON' and
1970
`GRUB_BUTTON_CMOS_ADDRESS' variables in default/grub (*note Simple
1970
`GRUB_BUTTON_CMOS_ADDRESS' variables in conf.d/grub (*note Simple
1971
configuration::).  `GRUB_TIMEOUT_BUTTON', `GRUB_DEFAULT_BUTTON' and
1971
configuration::).  `GRUB_TIMEOUT_BUTTON', `GRUB_DEFAULT_BUTTON' and
1972
`GRUB_HIDDEN_TIMEOUT_BUTTON' are used instead of the corresponding
1972
`GRUB_HIDDEN_TIMEOUT_BUTTON' are used instead of the corresponding
1973
variables without the `_BUTTON' suffix when powered on using the special
1973
variables without the `_BUTTON' suffix when powered on using the special
(-)grub-1.99~rc1/docs/grub.texi (-3 / +3 lines)
Lines 1004-1010 Link Here
1004
use when upgrading a distribution, and will discover available kernels and
1004
use when upgrading a distribution, and will discover available kernels and
1005
attempt to generate menu entries for them.
1005
attempt to generate menu entries for them.
1006
1006
1007
The file @file{/etc/default/grub} controls the operation of
1007
The file @file{/etc/conf.d/grub} controls the operation of
1008
@command{grub-mkconfig}.  It is sourced by a shell script, and so must be
1008
@command{grub-mkconfig}.  It is sourced by a shell script, and so must be
1009
valid POSIX shell input; normally, it will just be a sequence of
1009
valid POSIX shell input; normally, it will just be a sequence of
1010
@samp{KEY=value} lines, but if the value contains spaces or other special
1010
@samp{KEY=value} lines, but if the value contains spaces or other special
Lines 1014-1020 Link Here
1014
GRUB_TERMINAL_INPUT="console serial"
1014
GRUB_TERMINAL_INPUT="console serial"
1015
@end example
1015
@end example
1016
1016
1017
Valid keys in @file{/etc/default/grub} are as follows:
1017
Valid keys in @file{/etc/conf.d/grub} are as follows:
1018
1018
1019
@table @samp
1019
@table @samp
1020
@item GRUB_DEFAULT
1020
@item GRUB_DEFAULT
Lines 1941-1947 Link Here
1941
Some laptop vendors provide an additional power-on button which boots another
1941
Some laptop vendors provide an additional power-on button which boots another
1942
OS.  GRUB supports such buttons with the @samp{GRUB_TIMEOUT_BUTTON},
1942
OS.  GRUB supports such buttons with the @samp{GRUB_TIMEOUT_BUTTON},
1943
@samp{GRUB_DEFAULT_BUTTON}, @samp{GRUB_HIDDEN_TIMEOUT_BUTTON} and
1943
@samp{GRUB_DEFAULT_BUTTON}, @samp{GRUB_HIDDEN_TIMEOUT_BUTTON} and
1944
@samp{GRUB_BUTTON_CMOS_ADDRESS} variables in default/grub (@pxref{Simple
1944
@samp{GRUB_BUTTON_CMOS_ADDRESS} variables in conf.d/grub (@pxref{Simple
1945
configuration}).  @samp{GRUB_TIMEOUT_BUTTON}, @samp{GRUB_DEFAULT_BUTTON} and
1945
configuration}).  @samp{GRUB_TIMEOUT_BUTTON}, @samp{GRUB_DEFAULT_BUTTON} and
1946
@samp{GRUB_HIDDEN_TIMEOUT_BUTTON} are used instead of the corresponding
1946
@samp{GRUB_HIDDEN_TIMEOUT_BUTTON} are used instead of the corresponding
1947
variables without the @samp{_BUTTON} suffix when powered on using the special
1947
variables without the @samp{_BUTTON} suffix when powered on using the special
(-)grub-1.99~rc1/util/grub.d/README (-1 / +1 lines)
Lines 8-11 Link Here
8
The number namespace in-between is configurable by system installer and/or
8
The number namespace in-between is configurable by system installer and/or
9
administrator.  For example, you can add an entry to boot another OS as
9
administrator.  For example, you can add an entry to boot another OS as
10
01_otheros, 11_otheros, etc, depending on the position you want it to occupy in
10
01_otheros, 11_otheros, etc, depending on the position you want it to occupy in
11
the menu; and then adjust the default setting via /etc/default/grub.
11
the menu; and then adjust the default setting via /etc/conf.d/grub.
(-)grub-1.99~rc1/util/grub-install.in (-2 / +2 lines)
Lines 60-67 Link Here
60
efi_quiet=
60
efi_quiet=
61
61
62
# Get GRUB_DISTRIBUTOR.
62
# Get GRUB_DISTRIBUTOR.
63
if test -f "${sysconfdir}/default/grub" ; then
63
if test -f "${sysconfdir}/conf.d/grub" ; then
64
    . "${sysconfdir}/default/grub"
64
    . "${sysconfdir}/conf.d/grub"
65
fi
65
fi
66
66
67
bootloader_id="$(echo "$GRUB_DISTRIBUTOR" | tr '[A-Z]' '[a-z]' | cut -d' ' -f1)"
67
bootloader_id="$(echo "$GRUB_DISTRIBUTOR" | tr '[A-Z]' '[a-z]' | cut -d' ' -f1)"
(-)grub-1.99~rc1/util/grub-mkconfig.in (-4 / +4 lines)
Lines 152-159 Link Here
152
# choosing Hurd filesystem module.
152
# choosing Hurd filesystem module.
153
GRUB_FS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2> /dev/null || echo unknown`"
153
GRUB_FS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2> /dev/null || echo unknown`"
154
154
155
if test -f ${sysconfdir}/default/grub ; then
155
if test -f ${sysconfdir}/conf.d/grub ; then
156
  . ${sysconfdir}/default/grub
156
  . ${sysconfdir}/conf.d/grub
157
fi
157
fi
158
158
159
# XXX: should this be deprecated at some point?
159
# XXX: should this be deprecated at some point?
Lines 272-278 Link Here
272
# DO NOT EDIT THIS FILE
272
# DO NOT EDIT THIS FILE
273
#
273
#
274
# It is automatically generated by $self using templates
274
# It is automatically generated by $self using templates
275
# from ${grub_mkconfig_dir} and settings from ${sysconfdir}/default/grub
275
# from ${grub_mkconfig_dir} and settings from ${sysconfdir}/conf.d/grub
276
#
276
#
277
EOF
277
EOF
278
278
Lines 294-300 Link Here
294
if test "x${grub_cfg}" != "x" ; then
294
if test "x${grub_cfg}" != "x" ; then
295
  if ! ${grub_script_check} ${grub_cfg}.new; then
295
  if ! ${grub_script_check} ${grub_cfg}.new; then
296
    echo "Syntax errors are detected in generated GRUB config file." >&2
296
    echo "Syntax errors are detected in generated GRUB config file." >&2
297
    echo "Ensure that there are no errors in /etc/default/grub" >&2
297
    echo "Ensure that there are no errors in /etc/conf.d/grub" >&2
298
    echo "and /etc/grub.d/* files or please file a bug report with" >&2
298
    echo "and /etc/grub.d/* files or please file a bug report with" >&2
299
    echo "${grub_cfg}.new file attached." >&2
299
    echo "${grub_cfg}.new file attached." >&2
300
  else
300
  else

Return to bug 364763