Annotation of /trunk/grub/patches/grub-1.99-confd.patch
Parent Directory | Revision Log
Revision 1401 -
(hide annotations)
(download)
Fri Jul 1 22:56:37 2011 UTC (13 years, 2 months ago) by niro
File size: 5559 byte(s)
Fri Jul 1 22:56:37 2011 UTC (13 years, 2 months ago) by niro
File size: 5559 byte(s)
-added magellan conf.d patch
1 | niro | 1401 | diff -Naur grub-1.99/docs/grub.info grub-1.99-magellan/docs/grub.info |
2 | --- grub-1.99/docs/grub.info 2011-05-14 22:59:24.000000000 +0200 | ||
3 | +++ grub-1.99-magellan/docs/grub.info 2011-07-02 02:53:35.000000000 +0200 | ||
4 | @@ -995,7 +995,7 @@ | ||
5 | Booting::, and *note Shell-like scripting::), and to disable any system | ||
6 | provided by their distribution to automatically run `grub-mkconfig'. | ||
7 | |||
8 | - The file `/etc/default/grub' controls the operation of | ||
9 | + The file `/etc/conf.d/grub' controls the operation of | ||
10 | `grub-mkconfig'. It is sourced by a shell script, and so must be valid | ||
11 | POSIX shell input; normally, it will just be a sequence of `KEY=value' | ||
12 | lines, but if the value contains spaces or other special characters | ||
13 | @@ -1003,7 +1003,7 @@ | ||
14 | |||
15 | GRUB_TERMINAL_INPUT="console serial" | ||
16 | |||
17 | - Valid keys in `/etc/default/grub' are as follows: | ||
18 | + Valid keys in `/etc/conf.d/grub' are as follows: | ||
19 | |||
20 | `GRUB_DEFAULT' | ||
21 | The default menu entry. This may be a number, in which case it | ||
22 | @@ -2031,7 +2031,7 @@ | ||
23 | Some laptop vendors provide an additional power-on button which boots | ||
24 | another OS. GRUB supports such buttons with the `GRUB_TIMEOUT_BUTTON', | ||
25 | `GRUB_DEFAULT_BUTTON', `GRUB_HIDDEN_TIMEOUT_BUTTON' and | ||
26 | -`GRUB_BUTTON_CMOS_ADDRESS' variables in default/grub (*note Simple | ||
27 | +`GRUB_BUTTON_CMOS_ADDRESS' variables in conf.d/grub (*note Simple | ||
28 | configuration::). `GRUB_TIMEOUT_BUTTON', `GRUB_DEFAULT_BUTTON' and | ||
29 | `GRUB_HIDDEN_TIMEOUT_BUTTON' are used instead of the corresponding | ||
30 | variables without the `_BUTTON' suffix when powered on using the special | ||
31 | diff -Naur grub-1.99/docs/grub.texi grub-1.99-magellan/docs/grub.texi | ||
32 | --- grub-1.99/docs/grub.texi 2011-05-14 22:48:59.000000000 +0200 | ||
33 | +++ grub-1.99-magellan/docs/grub.texi 2011-07-02 02:52:51.000000000 +0200 | ||
34 | @@ -1045,7 +1045,7 @@ | ||
35 | (@pxref{Booting}, and @ref{Shell-like scripting}), and to disable any system | ||
36 | provided by their distribution to automatically run @command{grub-mkconfig}. | ||
37 | |||
38 | -The file @file{/etc/default/grub} controls the operation of | ||
39 | +The file @file{/etc/conf.d/grub} controls the operation of | ||
40 | @command{grub-mkconfig}. It is sourced by a shell script, and so must be | ||
41 | valid POSIX shell input; normally, it will just be a sequence of | ||
42 | @samp{KEY=value} lines, but if the value contains spaces or other special | ||
43 | @@ -1055,7 +1055,7 @@ | ||
44 | GRUB_TERMINAL_INPUT="console serial" | ||
45 | @end example | ||
46 | |||
47 | -Valid keys in @file{/etc/default/grub} are as follows: | ||
48 | +Valid keys in @file{/etc/conf.d/grub} are as follows: | ||
49 | |||
50 | @table @samp | ||
51 | @item GRUB_DEFAULT | ||
52 | @@ -2002,7 +2002,7 @@ | ||
53 | Some laptop vendors provide an additional power-on button which boots another | ||
54 | OS. GRUB supports such buttons with the @samp{GRUB_TIMEOUT_BUTTON}, | ||
55 | @samp{GRUB_DEFAULT_BUTTON}, @samp{GRUB_HIDDEN_TIMEOUT_BUTTON} and | ||
56 | -@samp{GRUB_BUTTON_CMOS_ADDRESS} variables in default/grub (@pxref{Simple | ||
57 | +@samp{GRUB_BUTTON_CMOS_ADDRESS} variables in conf.d/grub (@pxref{Simple | ||
58 | configuration}). @samp{GRUB_TIMEOUT_BUTTON}, @samp{GRUB_DEFAULT_BUTTON} and | ||
59 | @samp{GRUB_HIDDEN_TIMEOUT_BUTTON} are used instead of the corresponding | ||
60 | variables without the @samp{_BUTTON} suffix when powered on using the special | ||
61 | diff -Naur grub-1.99/util/grub.d/README grub-1.99-magellan/util/grub.d/README | ||
62 | --- grub-1.99/util/grub.d/README 2010-12-01 15:45:43.000000000 +0100 | ||
63 | +++ grub-1.99-magellan/util/grub.d/README 2011-07-02 02:48:55.000000000 +0200 | ||
64 | @@ -8,4 +8,4 @@ | ||
65 | The number namespace in-between is configurable by system installer and/or | ||
66 | administrator. For example, you can add an entry to boot another OS as | ||
67 | 01_otheros, 11_otheros, etc, depending on the position you want it to occupy in | ||
68 | -the menu; and then adjust the default setting via /etc/default/grub. | ||
69 | +the menu; and then adjust the default setting via /etc/conf.d/grub. | ||
70 | diff -Naur grub-1.99/util/grub-install.in grub-1.99-magellan/util/grub-install.in | ||
71 | --- grub-1.99/util/grub-install.in 2011-04-03 15:36:21.000000000 +0200 | ||
72 | +++ grub-1.99-magellan/util/grub-install.in 2011-07-02 02:54:55.000000000 +0200 | ||
73 | @@ -60,8 +60,8 @@ | ||
74 | efi_quiet= | ||
75 | |||
76 | # Get GRUB_DISTRIBUTOR. | ||
77 | -if test -f "${sysconfdir}/default/grub" ; then | ||
78 | - . "${sysconfdir}/default/grub" | ||
79 | +if test -f "${sysconfdir}/conf.d/grub" ; then | ||
80 | + . "${sysconfdir}/conf.d/grub" | ||
81 | fi | ||
82 | |||
83 | bootloader_id="$(echo "$GRUB_DISTRIBUTOR" | tr 'A-Z' 'a-z' | cut -d' ' -f1)" | ||
84 | diff -Naur grub-1.99/util/grub-mkconfig.in grub-1.99-magellan/util/grub-mkconfig.in | ||
85 | --- grub-1.99/util/grub-mkconfig.in 2011-04-06 17:45:53.000000000 +0200 | ||
86 | +++ grub-1.99-magellan/util/grub-mkconfig.in 2011-07-02 02:54:20.000000000 +0200 | ||
87 | @@ -152,8 +152,8 @@ | ||
88 | # choosing Hurd filesystem module. | ||
89 | GRUB_FS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2> /dev/null || echo unknown`" | ||
90 | |||
91 | -if test -f ${sysconfdir}/default/grub ; then | ||
92 | - . ${sysconfdir}/default/grub | ||
93 | +if test -f ${sysconfdir}/conf.d/grub ; then | ||
94 | + . ${sysconfdir}/conf.d/grub | ||
95 | fi | ||
96 | |||
97 | # XXX: should this be deprecated at some point? | ||
98 | @@ -272,7 +272,7 @@ | ||
99 | # DO NOT EDIT THIS FILE | ||
100 | # | ||
101 | # It is automatically generated by $self using templates | ||
102 | -# from ${grub_mkconfig_dir} and settings from ${sysconfdir}/default/grub | ||
103 | +# from ${grub_mkconfig_dir} and settings from ${sysconfdir}/conf.d/grub | ||
104 | # | ||
105 | EOF | ||
106 | |||
107 | @@ -296,7 +296,7 @@ | ||
108 | if test "x${grub_cfg}" != "x" ; then | ||
109 | if ! ${grub_script_check} ${grub_cfg}.new; then | ||
110 | echo "Syntax errors are detected in generated GRUB config file." >&2 | ||
111 | - echo "Ensure that there are no errors in /etc/default/grub" >&2 | ||
112 | + echo "Ensure that there are no errors in /etc/conf.d/grub" >&2 | ||
113 | echo "and /etc/grub.d/* files or please file a bug report with" >&2 | ||
114 | echo "${grub_cfg}.new file attached." >&2 | ||
115 | else |