Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/grub/patches/grub-2.04-confd.patch

    Contents of /trunk/grub/patches/grub-2.04-confd.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 3532 - (show annotations) (download)
    Tue Jul 7 12:27:55 2020 UTC (3 years, 9 months ago) by niro
    File size: 32695 byte(s) 
    -rediffed for grub-2.04
    1 diff -Naur grub-2.04/ChangeLog-2015 grub-2.04-magellan/ChangeLog-2015
    2 --- grub-2.04/ChangeLog-2015 2018-11-24 18:13:02.000000000 +0100
    3 +++ grub-2.04-magellan/ChangeLog-2015 2020-07-07 14:09:51.564089996 +0200
    4 @@ -48591,7 +48591,7 @@
    5
    6 * util/grub.d/00_header.in: Set default gfxmode to `800x600x16'.
    7
    8 - * util/update-grub.in: Add a reference to ${sysconfdir}/default/grub in
    9 + * util/update-grub.in: Add a reference to ${sysconfdir}/conf.d/grub in
    10 the grub.cfg header message.
    11
    12 2007-05-11 Robert Millan <rmh@aybabtu.com>
    13 diff -Naur grub-2.04/docs/grub.info grub-2.04-magellan/docs/grub.info
    14 --- grub-2.04/docs/grub.info 2019-07-04 16:09:32.000000000 +0200
    15 +++ grub-2.04-magellan/docs/grub.info 2020-07-07 14:10:42.556365715 +0200
    16 @@ -1156,7 +1156,7 @@
    17 Booting::, and *note Shell-like scripting::), and to disable any system
    18 provided by their distribution to automatically run 'grub-mkconfig'.
    19
    20 - The file '/etc/default/grub' controls the operation of
    21 + The file '/etc/conf.d/grub' controls the operation of
    22 'grub-mkconfig'. It is sourced by a shell script, and so must be valid
    23 POSIX shell input; normally, it will just be a sequence of 'KEY=value'
    24 lines, but if the value contains spaces or other special characters then
    25 @@ -1164,7 +1164,7 @@
    26
    27 GRUB_TERMINAL_INPUT="console serial"
    28
    29 - Valid keys in '/etc/default/grub' are as follows:
    30 + Valid keys in '/etc/conf.d/grub' are as follows:
    31
    32 'GRUB_DEFAULT'
    33 The default menu entry. This may be a number, in which case it
    34 @@ -1755,7 +1755,7 @@
    35
    36 'GRUB_DISABLE_OS_PROBER=true'
    37
    38 - in /etc/default/grub
    39 + in /etc/conf.d/grub
    40
    41 Then write a grub.cfg (/mnt/boot/grub/grub.cfg):
    42
    43 @@ -2546,7 +2546,7 @@
    44 Some laptop vendors provide an additional power-on button which boots
    45 another OS. GRUB supports such buttons with the 'GRUB_TIMEOUT_BUTTON',
    46 'GRUB_TIMEOUT_STYLE_BUTTON', 'GRUB_DEFAULT_BUTTON', and
    47 -'GRUB_BUTTON_CMOS_ADDRESS' variables in default/grub (*note Simple
    48 +'GRUB_BUTTON_CMOS_ADDRESS' variables in conf.d/grub (*note Simple
    49 configuration::). 'GRUB_TIMEOUT_BUTTON', 'GRUB_TIMEOUT_STYLE_BUTTON',
    50 and 'GRUB_DEFAULT_BUTTON' are used instead of the corresponding
    51 variables without the '_BUTTON' suffix when powered on using the special
    52 diff -Naur grub-2.04/docs/grub.texi grub-2.04-magellan/docs/grub.texi
    53 --- grub-2.04/docs/grub.texi 2019-06-24 12:10:28.000000000 +0200
    54 +++ grub-2.04-magellan/docs/grub.texi 2020-07-07 14:11:19.556842039 +0200
    55 @@ -1240,7 +1240,7 @@
    56 (@pxref{Booting}, and @ref{Shell-like scripting}), and to disable any system
    57 provided by their distribution to automatically run @command{grub-mkconfig}.
    58
    59 -The file @file{/etc/default/grub} controls the operation of
    60 +The file @file{/etc/conf.d/grub} controls the operation of
    61 @command{grub-mkconfig}. It is sourced by a shell script, and so must be
    62 valid POSIX shell input; normally, it will just be a sequence of
    63 @samp{KEY=value} lines, but if the value contains spaces or other special
    64 @@ -1250,7 +1250,7 @@
    65 GRUB_TERMINAL_INPUT="console serial"
    66 @end example
    67
    68 -Valid keys in @file{/etc/default/grub} are as follows:
    69 +Valid keys in @file{/etc/conf.d/grub} are as follows:
    70
    71 @table @samp
    72 @item GRUB_DEFAULT
    73 @@ -1832,7 +1832,7 @@
    74
    75 @code{GRUB_DISABLE_OS_PROBER=true}
    76
    77 -in /etc/default/grub
    78 +in /etc/conf.d/grub
    79
    80 Then write a grub.cfg (/mnt/boot/grub/grub.cfg):
    81
    82 @@ -2604,7 +2604,7 @@
    83 Some laptop vendors provide an additional power-on button which boots
    84 another OS. GRUB supports such buttons with the @samp{GRUB_TIMEOUT_BUTTON},
    85 @samp{GRUB_TIMEOUT_STYLE_BUTTON}, @samp{GRUB_DEFAULT_BUTTON}, and
    86 -@samp{GRUB_BUTTON_CMOS_ADDRESS} variables in default/grub (@pxref{Simple
    87 +@samp{GRUB_BUTTON_CMOS_ADDRESS} variables in conf.d/grub (@pxref{Simple
    88 configuration}). @samp{GRUB_TIMEOUT_BUTTON},
    89 @samp{GRUB_TIMEOUT_STYLE_BUTTON}, and @samp{GRUB_DEFAULT_BUTTON} are used
    90 instead of the corresponding variables without the @samp{_BUTTON} suffix
    91 diff -Naur grub-2.04/po/ast.po grub-2.04-magellan/po/ast.po
    92 --- grub-2.04/po/ast.po 2019-07-04 16:09:53.000000000 +0200
    93 +++ grub-2.04-magellan/po/ast.po 2020-07-07 14:12:14.920061111 +0200
    94 @@ -6700,13 +6700,13 @@
    95
    96 #~ msgid ""
    97 #~ "Syntax errors are detected in generated GRUB config file.\n"
    98 -#~ "Ensure that there are no errors in /etc/default/grub\n"
    99 +#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
    100 #~ "and /etc/grub.d/* files or please file a bug report with\n"
    101 #~ "%s file attached."
    102 #~ msgstr ""
    103 #~ "Deteutáronse fallos de sintaxis nel ficheru xeneráu de la\n"
    104 #~ " configuración de GRUB. Asegúrate que nun heba fallos\n"
    105 -#~ " nos ficheros /etc/default/grub y /etc/grub.d/*, sinón\n"
    106 +#~ " nos ficheros /etc/conf.d/grub y /etc/grub.d/*, sinón\n"
    107 #~ " rellena un informe de fallos col ficheru de darréu axuntáu\n"
    108 #~ "%s ."
    109
    110 @@ -6765,8 +6765,8 @@
    111 #~ msgid "Set the default boot menu entry for GRUB."
    112 #~ msgstr "Afita la entrada predeterminada del menú d'arranque de GRUB."
    113
    114 -#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
    115 -#~ msgstr "Esto rique l'axuste GRUB_DEFAULT=saved en %s/default/grub.\\n"
    116 +#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
    117 +#~ msgstr "Esto rique l'axuste GRUB_DEFAULT=saved en %s/conf.d/grub.\\n"
    118
    119 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
    120 #~ msgstr ""
    121 diff -Naur grub-2.04/po/ca.po grub-2.04-magellan/po/ca.po
    122 --- grub-2.04/po/ca.po 2019-07-04 16:09:53.000000000 +0200
    123 +++ grub-2.04-magellan/po/ca.po 2020-07-07 14:14:51.039873662 +0200
    124 @@ -6751,13 +6751,13 @@
    125
    126 #~ msgid ""
    127 #~ "Syntax errors are detected in generated GRUB config file.\n"
    128 -#~ "Ensure that there are no errors in /etc/default/grub\n"
    129 +#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
    130 #~ "and /etc/grub.d/* files or please file a bug report with\n"
    131 #~ "%s file attached."
    132 #~ msgstr ""
    133 #~ "S'han detectat errors de sintaxi al fitxer de configuració del GRUB "
    134 #~ "generat.\n"
    135 -#~ "Assegureu-vos que no hi ha errors a /etc/default/grub o als fitxers\n"
    136 +#~ "Assegureu-vos que no hi ha errors a /etc/conf.d/grub o als fitxers\n"
    137 #~ " /etc/grub.d/* o bé envieu un informe d'error adjuntant el fitxer %s "
    138
    139 #~ msgid "done"
    140 @@ -6811,8 +6811,8 @@
    141 #~ msgid "Set the default boot menu entry for GRUB."
    142 #~ msgstr "Estableix l'entrada del menú d'arrencada per defecte del GRUB."
    143
    144 -#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
    145 -#~ msgstr "Necessita configurar GRUB_DEFAULT=saved a %s/default/grub.\\n"
    146 +#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
    147 +#~ msgstr "Necessita configurar GRUB_DEFAULT=saved a %s/conf.d/grub.\\n"
    148
    149 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
    150 #~ msgstr ""
    151 diff -Naur grub-2.04/po/da.po grub-2.04-magellan/po/da.po
    152 --- grub-2.04/po/da.po 2019-07-04 16:09:53.000000000 +0200
    153 +++ grub-2.04-magellan/po/da.po 2020-07-07 14:13:31.591984346 +0200
    154 @@ -6718,13 +6718,13 @@
    155
    156 #~ msgid ""
    157 #~ "Syntax errors are detected in generated GRUB config file.\n"
    158 -#~ "Ensure that there are no errors in /etc/default/grub\n"
    159 +#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
    160 #~ "and /etc/grub.d/* files or please file a bug report with\n"
    161 #~ "%s file attached."
    162 #~ msgstr ""
    163 #~ "Der blev fundet syntaksfejl i den genererede GRUB-\n"
    164 #~ "konfigurationsfil. Sikr dig at der ikke er nogen fejl\n"
    165 -#~ "i filerne /etc/default/grub eller /etc/grub.d/*, eller\n"
    166 +#~ "i filerne /etc/conf.d/grub eller /etc/grub.d/*, eller\n"
    167 #~ "indsend venligst en fejlrapport med filen %s vedhæftet."
    168
    169 #~ msgid "done"
    170 @@ -6774,8 +6774,8 @@
    171 #~ msgid "Set the default boot menu entry for GRUB."
    172 #~ msgstr "Sæt standardmenuindgangen for opstart i GRUB."
    173
    174 -#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
    175 -#~ msgstr "Dette kræver at GRUB_DEFAULT=saved angives i %s/default/grub.\\n"
    176 +#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
    177 +#~ msgstr "Dette kræver at GRUB_DEFAULT=saved angives i %s/conf.d/grub.\\n"
    178
    179 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
    180 #~ msgstr ""
    181 diff -Naur grub-2.04/po/es.po grub-2.04-magellan/po/es.po
    182 --- grub-2.04/po/es.po 2019-07-04 16:09:53.000000000 +0200
    183 +++ grub-2.04-magellan/po/es.po 2020-07-07 14:19:07.685312707 +0200
    184 @@ -6838,13 +6838,13 @@
    185
    186 #~ msgid ""
    187 #~ "Syntax errors are detected in generated GRUB config file.\n"
    188 -#~ "Ensure that there are no errors in /etc/default/grub\n"
    189 +#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
    190 #~ "and /etc/grub.d/* files or please file a bug report with\n"
    191 #~ "%s file attached."
    192 #~ msgstr ""
    193 #~ "Se han detectado errores de sintaxis en el fichero de\n"
    194 #~ "configuración de GRUB generado.\n"
    195 -#~ "Asegurese de que no hay errores en /etc/default/grub\n"
    196 +#~ "Asegurese de que no hay errores en /etc/conf.d/grub\n"
    197 #~ "en los ficheros /etc/grub.d/* o, por favor, abra una\n"
    198 #~ "notificación de errores con el fichero %s adjunto."
    199
    200 @@ -6898,8 +6898,8 @@
    201 #~ msgid "Set the default boot menu entry for GRUB."
    202 #~ msgstr "Establece la entrada del menú predeterminada para GRUB."
    203
    204 -#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
    205 -#~ msgstr "Esto requere establecer GRUB_DEFAULT=saved en %s/default/grub.\\n"
    206 +#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
    207 +#~ msgstr "Esto requere establecer GRUB_DEFAULT=saved en %s/conf.d/grub.\\n"
    208
    209 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
    210 #~ msgstr ""
    211 diff -Naur grub-2.04/po/fi.po grub-2.04-magellan/po/fi.po
    212 --- grub-2.04/po/fi.po 2019-07-04 16:09:53.000000000 +0200
    213 +++ grub-2.04-magellan/po/fi.po 2020-07-07 14:19:27.320041617 +0200
    214 @@ -6737,12 +6737,12 @@
    215
    216 #~ msgid ""
    217 #~ "Syntax errors are detected in generated GRUB config file.\n"
    218 -#~ "Ensure that there are no errors in /etc/default/grub\n"
    219 +#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
    220 #~ "and /etc/grub.d/* files or please file a bug report with\n"
    221 #~ "%s file attached."
    222 #~ msgstr ""
    223 #~ "Syntaksivirheita havaittu tuotettaessa GRUB-asetustiedostoa.\n"
    224 -#~ "Varmista, että tiedostoissa /etc/default/grub ja /etc/grub.d/*\n"
    225 +#~ "Varmista, että tiedostoissa /etc/conf.d/grub ja /etc/grub.d/*\n"
    226 #~ "ei ole mitään virheitä tai tee vikailmoitus tiedosto %s\n"
    227 #~ "liitteenä."
    228
    229 @@ -6799,9 +6799,9 @@
    230 #~ msgid "Set the default boot menu entry for GRUB."
    231 #~ msgstr "Aseta käynnistyksen oletusvalikkorivi GRUB:lle"
    232
    233 -#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
    234 +#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
    235 #~ msgstr ""
    236 -#~ "Tämä vaatii asetuksen GRUB_DEFAULT=saved tiedostossa %s/default/grub.\\n"
    237 +#~ "Tämä vaatii asetuksen GRUB_DEFAULT=saved tiedostossa %s/conf.d/grub.\\n"
    238
    239 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
    240 #~ msgstr ""
    241 diff -Naur grub-2.04/po/fr.po grub-2.04-magellan/po/fr.po
    242 --- grub-2.04/po/fr.po 2019-07-04 16:09:53.000000000 +0200
    243 +++ grub-2.04-magellan/po/fr.po 2020-07-07 14:16:04.696847860 +0200
    244 @@ -6791,13 +6791,13 @@
    245
    246 #~ msgid ""
    247 #~ "Syntax errors are detected in generated GRUB config file.\n"
    248 -#~ "Ensure that there are no errors in /etc/default/grub\n"
    249 +#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
    250 #~ "and /etc/grub.d/* files or please file a bug report with\n"
    251 #~ "%s file attached."
    252 #~ msgstr ""
    253 #~ "Des erreurs de syntaxe sont détectées dans le fichier de configuration\n"
    254 #~ "de GRUB. Veuillez vérifier qu'il n'y a pas d'erreur dans les fichiers\n"
    255 -#~ "/etc/default/grub et /etc/grub.d/*. Sinon veuillez signaler un bogue\n"
    256 +#~ "/etc/conf.d/grub et /etc/grub.d/*. Sinon veuillez signaler un bogue\n"
    257 #~ "en joignant le fichier %s."
    258
    259 #~ msgid "done"
    260 @@ -6853,9 +6853,9 @@
    261 #~ msgid "Set the default boot menu entry for GRUB."
    262 #~ msgstr "Configurer l'entrée de menu par défaut pour GRUB."
    263
    264 -#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
    265 +#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
    266 #~ msgstr ""
    267 -#~ "Cela nécessite de configurer GRUB_DEFAULT=saved dans %s/default/grub.\\n"
    268 +#~ "Cela nécessite de configurer GRUB_DEFAULT=saved dans %s/conf.d/grub.\\n"
    269
    270 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
    271 #~ msgstr ""
    272 diff -Naur grub-2.04/po/gl.po grub-2.04-magellan/po/gl.po
    273 --- grub-2.04/po/gl.po 2019-07-04 16:09:53.000000000 +0200
    274 +++ grub-2.04-magellan/po/gl.po 2020-07-07 14:14:24.366246033 +0200
    275 @@ -6847,13 +6847,13 @@
    276
    277 #~ msgid ""
    278 #~ "Syntax errors are detected in generated GRUB config file.\n"
    279 -#~ "Ensure that there are no errors in /etc/default/grub\n"
    280 +#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
    281 #~ "and /etc/grub.d/* files or please file a bug report with\n"
    282 #~ "%s file attached."
    283 #~ msgstr ""
    284 #~ "Detectáronse erros sintácticos no ficheiro de configuración do GRUB "
    285 #~ "xerado.\n"
    286 -#~ "Asegúrese de que non hai erros en /etc/default/grub\n"
    287 +#~ "Asegúrese de que non hai erros en /etc/conf.d/grub\n"
    288 #~ "e nos ficheiros /etc/grub.d/* ou escriba un informe de erro co\n"
    289 #~ "%s ficheiro anexado."
    290
    291 @@ -6900,9 +6900,9 @@
    292 #~ msgid "Set the default boot menu entry for GRUB."
    293 #~ msgstr "Estabelecer a entrada predeterminada do menú de arranque no GRUB."
    294
    295 -#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
    296 +#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
    297 #~ msgstr ""
    298 -#~ "Isto require a opción GRUB_PREDETERMINADO=gardada en %s/default/grub.\\n"
    299 +#~ "Isto require a opción GRUB_PREDETERMINADO=gardada en %s/conf.d/grub.\\n"
    300
    301 #~ msgid ""
    302 #~ "Requested serial terminal but GRUB_SERIAL_COMMAND is unspecified. Default "
    303 diff -Naur grub-2.04/po/hr.po grub-2.04-magellan/po/hr.po
    304 --- grub-2.04/po/hr.po 2019-07-04 16:09:53.000000000 +0200
    305 +++ grub-2.04-magellan/po/hr.po 2020-07-07 14:13:07.894316606 +0200
    306 @@ -6677,12 +6677,12 @@
    307
    308 #~ msgid ""
    309 #~ "Syntax errors are detected in generated GRUB config file.\n"
    310 -#~ "Ensure that there are no errors in /etc/default/grub\n"
    311 +#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
    312 #~ "and /etc/grub.d/* files or please file a bug report with\n"
    313 #~ "%s file attached."
    314 #~ msgstr ""
    315 #~ "Greške sintakse su otkrivene u stvorenoj GRUB datoteci podešavanja.\n"
    316 -#~ "Pobrinite se da ne postoje greške u /etc/default/grub\n"
    317 +#~ "Pobrinite se da ne postoje greške u /etc/conf.d/grub\n"
    318 #~ "i /etc/grub.d/* datotekama ili pošaljite izvješće greške s\n"
    319 #~ "%s priloženoj datoteci."
    320
    321 @@ -6734,9 +6734,9 @@
    322 #~ msgid "Set the default boot menu entry for GRUB."
    323 #~ msgstr "Postavi zadanu stavku izbornika pokretanja za GRUB."
    324
    325 -#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
    326 +#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
    327 #~ msgstr ""
    328 -#~ "Ovo zahtijeva postavku GRUB_DEFAULT=spremljenju u %s/default/grub.\\n"
    329 +#~ "Ovo zahtijeva postavku GRUB_DEFAULT=spremljenju u %s/conf.d/grub.\\n"
    330
    331 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
    332 #~ msgstr ""
    333 diff -Naur grub-2.04/po/hu.po grub-2.04-magellan/po/hu.po
    334 --- grub-2.04/po/hu.po 2019-07-04 16:12:05.000000000 +0200
    335 +++ grub-2.04-magellan/po/hu.po 2020-07-07 14:16:48.494239492 +0200
    336 @@ -6730,12 +6730,12 @@
    337
    338 #~ msgid ""
    339 #~ "Syntax errors are detected in generated GRUB config file.\n"
    340 -#~ "Ensure that there are no errors in /etc/default/grub\n"
    341 +#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
    342 #~ "and /etc/grub.d/* files or please file a bug report with\n"
    343 #~ "%s file attached."
    344 #~ msgstr ""
    345 #~ "Szintaktikai hibák találhatók az előállított GRUB beállítófájlban.\n"
    346 -#~ "Győződjön meg arról, hogy nincsenek hibák a /etc/default/grub\n"
    347 +#~ "Győződjön meg arról, hogy nincsenek hibák a /etc/conf.d/grub\n"
    348 #~ "és a /etc/grub.d/* fájlokban, vagy küldjön egy hibajelentést a(z)\n"
    349 #~ "%s fájllal mellékelve."
    350
    351 @@ -6789,9 +6789,9 @@
    352 #~ msgstr ""
    353 #~ "A GRUB alapértelmezett rendszerindítási menübejegyzésének beállítása."
    354
    355 -#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
    356 +#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
    357 #~ msgstr ""
    358 -#~ "Ez a GRUB_DEFAULT=saved beállítást igényli a(z) %s/default/grub fájlban."
    359 +#~ "Ez a GRUB_DEFAULT=saved beállítást igényli a(z) %s/conf.d/grub fájlban."
    360 #~ "\\n"
    361
    362 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
    363 diff -Naur grub-2.04/po/lt.po grub-2.04-magellan/po/lt.po
    364 --- grub-2.04/po/lt.po 2019-07-04 16:12:05.000000000 +0200
    365 +++ grub-2.04-magellan/po/lt.po 2020-07-07 14:18:31.386814297 +0200
    366 @@ -6637,12 +6637,12 @@
    367
    368 #~ msgid ""
    369 #~ "Syntax errors are detected in generated GRUB config file.\n"
    370 -#~ "Ensure that there are no errors in /etc/default/grub\n"
    371 +#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
    372 #~ "and /etc/grub.d/* files or please file a bug report with\n"
    373 #~ "%s file attached."
    374 #~ msgstr ""
    375 #~ "Sukurtame GRUB konfigūracijos faile aptikta klaidų.\n"
    376 -#~ "Įsitikinkite, ar nėra klaidų /etc/default/grub\n"
    377 +#~ "Įsitikinkite, ar nėra klaidų /etc/conf.d/grub\n"
    378 #~ "ir /etc/grub.d/* failuose arba praneškite apie klaidą\n"
    379 #~ "prisegdami %s failą."
    380
    381 @@ -6673,8 +6673,8 @@
    382 #~ msgid "Set the default boot menu entry for GRUB."
    383 #~ msgstr "Nurodyti numatytąjį numatytąjį paleidimo GRUB meniu įrašą."
    384
    385 -#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
    386 -#~ msgstr "Tam reikia įrašyti GRUB_DEFAULT=saved faile %s/default/grub.\\n"
    387 +#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
    388 +#~ msgstr "Tam reikia įrašyti GRUB_DEFAULT=saved faile %s/conf.d/grub.\\n"
    389
    390 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
    391 #~ msgstr ""
    392 diff -Naur grub-2.04/po/nb.po grub-2.04-magellan/po/nb.po
    393 --- grub-2.04/po/nb.po 2019-07-04 16:12:05.000000000 +0200
    394 +++ grub-2.04-magellan/po/nb.po 2020-07-07 14:12:45.106636556 +0200
    395 @@ -6676,12 +6676,12 @@
    396
    397 #~ msgid ""
    398 #~ "Syntax errors are detected in generated GRUB config file.\n"
    399 -#~ "Ensure that there are no errors in /etc/default/grub\n"
    400 +#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
    401 #~ "and /etc/grub.d/* files or please file a bug report with\n"
    402 #~ "%s file attached."
    403 #~ msgstr ""
    404 #~ "Generert GRUB-oppsettsfil inneholder syntaksfeil.\n"
    405 -#~ "Kontroller at grunnlaget i /etc/default/grub og /etc/grub.d/*\n"
    406 +#~ "Kontroller at grunnlaget i /etc/conf.d/grub og /etc/grub.d/*\n"
    407 #~ "ikke innheholder feil, og send inn en feilrapport\n"
    408 #~ "med %s vedlagt hvis du fremdeles har problemer."
    409
    410 @@ -6733,9 +6733,9 @@
    411 #~ msgid "Set the default boot menu entry for GRUB."
    412 #~ msgstr "Velg standardoppføring på GRUB-oppstartsmenyen."
    413
    414 -#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
    415 +#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
    416 #~ msgstr ""
    417 -#~ "Dette krever at du gir en verdi til «GRUB_DEFAULT=» i fila %s/default/"
    418 +#~ "Dette krever at du gir en verdi til «GRUB_DEFAULT=» i fila %s/conf.d/"
    419 #~ "grub.\\n"
    420
    421 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
    422 diff -Naur grub-2.04/po/nl.po grub-2.04-magellan/po/nl.po
    423 --- grub-2.04/po/nl.po 2019-07-04 16:12:05.000000000 +0200
    424 +++ grub-2.04-magellan/po/nl.po 2020-07-07 14:17:09.383949705 +0200
    425 @@ -6758,13 +6758,13 @@
    426
    427 #~ msgid ""
    428 #~ "Syntax errors are detected in generated GRUB config file.\n"
    429 -#~ "Ensure that there are no errors in /etc/default/grub\n"
    430 +#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
    431 #~ "and /etc/grub.d/* files or please file a bug report with\n"
    432 #~ "%s file attached."
    433 #~ msgstr ""
    434 #~ "Er zijn syntaxfouten gevonden in het aangemaakte GRUB-"
    435 #~ "configuratiebestand.\n"
    436 -#~ "Verzeker u ervan dat er geen fouten zitten in het bestand /etc/default/"
    437 +#~ "Verzeker u ervan dat er geen fouten zitten in het bestand /etc/conf.d/"
    438 #~ "grub\n"
    439 #~ "noch in de bestanden in /etc/grub.d/. Rapporteer anders een fout, met "
    440 #~ "het\n"
    441 @@ -6817,9 +6817,9 @@
    442 #~ msgid "Set the default boot menu entry for GRUB."
    443 #~ msgstr "Het standaardmenu-item voor GRUB instellen."
    444
    445 -#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
    446 +#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
    447 #~ msgstr ""
    448 -#~ "Dit vereist het instellen van GRUB_DEFAULT=saved in %s/default/grub.\\n"
    449 +#~ "Dit vereist het instellen van GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
    450
    451 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
    452 #~ msgstr "MENU-ITEM is het nummer, de titel, of het ID van een menu-item."
    453 diff -Naur grub-2.04/po/ru.po grub-2.04-magellan/po/ru.po
    454 --- grub-2.04/po/ru.po 2019-07-04 16:12:05.000000000 +0200
    455 +++ grub-2.04-magellan/po/ru.po 2020-07-07 14:15:42.471157017 +0200
    456 @@ -6704,12 +6704,12 @@
    457
    458 #~ msgid ""
    459 #~ "Syntax errors are detected in generated GRUB config file.\n"
    460 -#~ "Ensure that there are no errors in /etc/default/grub\n"
    461 +#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
    462 #~ "and /etc/grub.d/* files or please file a bug report with\n"
    463 #~ "%s file attached."
    464 #~ msgstr ""
    465 #~ "В сгенерированном файле настроек GRUB обнаружены синтаксические ошибки.\n"
    466 -#~ "Убедитесь, что в файлах /etc/default/grub\n"
    467 +#~ "Убедитесь, что в файлах /etc/conf.d/grub\n"
    468 #~ "и /etc/grub.d/* ошибки отсутствуют или пошлите сообщение об ошибке\n"
    469 #~ "в прикреплённым файлом %s."
    470
    471 @@ -6760,8 +6760,8 @@
    472 #~ msgid "Set the default boot menu entry for GRUB."
    473 #~ msgstr "Назначает пункт меню GRUB для загрузки по умолчанию."
    474
    475 -#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
    476 -#~ msgstr "Для этого требуется строка GRUB_DEFAULT=saved в %s/default/grub.\\n"
    477 +#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
    478 +#~ msgstr "Для этого требуется строка GRUB_DEFAULT=saved в %s/conf.d/grub.\\n"
    479
    480 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
    481 #~ msgstr ""
    482 diff -Naur grub-2.04/po/sl.po grub-2.04-magellan/po/sl.po
    483 --- grub-2.04/po/sl.po 2019-07-04 16:12:05.000000000 +0200
    484 +++ grub-2.04-magellan/po/sl.po 2020-07-07 14:17:42.783486856 +0200
    485 @@ -6951,12 +6951,12 @@
    486
    487 #~ msgid ""
    488 #~ "Syntax errors are detected in generated GRUB config file.\n"
    489 -#~ "Ensure that there are no errors in /etc/default/grub\n"
    490 +#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
    491 #~ "and /etc/grub.d/* files or please file a bug report with\n"
    492 #~ "%s file attached."
    493 #~ msgstr ""
    494 #~ "V ustvarjeni nastavitveni datoteki GRUB so zaznane napake\n"
    495 -#~ " skladnje. Prepričajte se, da v datotekah /etc/default/grub in\n"
    496 +#~ " skladnje. Prepričajte se, da v datotekah /etc/conf.d/grub in\n"
    497 #~ "/etc/grub.d/* ni napak ali pa pošljite poročilo o hrošču s pripeto\n"
    498 #~ "datoteko %s."
    499
    500 diff -Naur grub-2.04/po/sr.po grub-2.04-magellan/po/sr.po
    501 --- grub-2.04/po/sr.po 2019-07-04 16:12:05.000000000 +0200
    502 +++ grub-2.04-magellan/po/sr.po 2020-07-07 14:15:17.687502134 +0200
    503 @@ -6696,12 +6696,12 @@
    504
    505 #~ msgid ""
    506 #~ "Syntax errors are detected in generated GRUB config file.\n"
    507 -#~ "Ensure that there are no errors in /etc/default/grub\n"
    508 +#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
    509 #~ "and /etc/grub.d/* files or please file a bug report with\n"
    510 #~ "%s file attached."
    511 #~ msgstr ""
    512 #~ "Откривене су грешке синтаксе у створеној датотеци подешавања ГРУБ-а.\n"
    513 -#~ "Проверите да ли има грешака у датотекама „/etc/default/grub“\n"
    514 +#~ "Проверите да ли има грешака у датотекама „/etc/conf.d/grub“\n"
    515 #~ "и „/etc/grub.d/*“ или попуните извештај о грешкама\n"
    516 #~ "и приложите датотеку „%s“."
    517
    518 @@ -6755,8 +6755,8 @@
    519 #~ msgid "Set the default boot menu entry for GRUB."
    520 #~ msgstr "Подешава основни унос изборника подизања за ГРУБ."
    521
    522 -#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
    523 -#~ msgstr "Ово захтева подешавање „GRUB_DEFAULT=saved“ у „%s/default/grub“.\\n"
    524 +#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
    525 +#~ msgstr "Ово захтева подешавање „GRUB_DEFAULT=saved“ у „%s/conf.d/grub“.\\n"
    526
    527 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
    528 #~ msgstr ""
    529 diff -Naur grub-2.04/po/sv.po grub-2.04-magellan/po/sv.po
    530 --- grub-2.04/po/sv.po 2019-07-04 16:12:05.000000000 +0200
    531 +++ grub-2.04-magellan/po/sv.po 2020-07-07 14:18:07.620143034 +0200
    532 @@ -6674,12 +6674,12 @@
    533
    534 #~ msgid ""
    535 #~ "Syntax errors are detected in generated GRUB config file.\n"
    536 -#~ "Ensure that there are no errors in /etc/default/grub\n"
    537 +#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
    538 #~ "and /etc/grub.d/* files or please file a bug report with\n"
    539 #~ "%s file attached."
    540 #~ msgstr ""
    541 #~ "Syntaxfel upptäcktes i den genererade GRUB-konfigurationsfilen.\n"
    542 -#~ "Kontrollera att det inte finns några fel i /etc/default/grub-\n"
    543 +#~ "Kontrollera att det inte finns några fel i /etc/conf.d/grub-\n"
    544 #~ "och /etc/grub.d/*-filerna eller skicka in en felrapport med\n"
    545 #~ "bifogad %s-fil."
    546
    547 @@ -6730,8 +6730,8 @@
    548 #~ msgid "Set the default boot menu entry for GRUB."
    549 #~ msgstr "Ange standardpost för GRUBs startmeny."
    550
    551 -#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
    552 -#~ msgstr "Detta kräver inställningen GRUB_DEFAULT=saved i %s/default/grub.\\n"
    553 +#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
    554 +#~ msgstr "Detta kräver inställningen GRUB_DEFAULT=saved i %s/conf.d/grub.\\n"
    555
    556 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
    557 #~ msgstr ""
    558 diff -Naur grub-2.04/po/tr.po grub-2.04-magellan/po/tr.po
    559 --- grub-2.04/po/tr.po 2019-07-04 16:12:05.000000000 +0200
    560 +++ grub-2.04-magellan/po/tr.po 2020-07-07 14:18:44.824628539 +0200
    561 @@ -6606,9 +6606,9 @@
    562 #~ msgid "Set the default boot menu entry for GRUB."
    563 #~ msgstr "GRUB için varsayılan önyükleme menü girdisini ayarla."
    564
    565 -#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
    566 +#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
    567 #~ msgstr ""
    568 -#~ "Bu, %s/default/grub içinde GRUB_DEFAULT=saved olmasını gerektirir.\\n"
    569 +#~ "Bu, %s/conf.d/grub içinde GRUB_DEFAULT=saved olmasını gerektirir.\\n"
    570
    571 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
    572 #~ msgstr ""
    573 diff -Naur grub-2.04/po/uk.po grub-2.04-magellan/po/uk.po
    574 --- grub-2.04/po/uk.po 2019-07-04 16:12:05.000000000 +0200
    575 +++ grub-2.04-magellan/po/uk.po 2020-07-07 14:13:57.183626048 +0200
    576 @@ -6764,12 +6764,12 @@
    577
    578 #~ msgid ""
    579 #~ "Syntax errors are detected in generated GRUB config file.\n"
    580 -#~ "Ensure that there are no errors in /etc/default/grub\n"
    581 +#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
    582 #~ "and /etc/grub.d/* files or please file a bug report with\n"
    583 #~ "%s file attached."
    584 #~ msgstr ""
    585 #~ "Виявлено синтаксичні помилки у файлі налаштувань GRUB.\n"
    586 -#~ "Переконайтеся, що у файлах /etc/default/grub і /etc/grub.d/*\n"
    587 +#~ "Переконайтеся, що у файлах /etc/conf.d/grub і /etc/grub.d/*\n"
    588 #~ "немає помилок, будь ласка, створіть звіт щодо вади з\n"
    589 #~ "долученням файла %s."
    590
    591 @@ -6824,8 +6824,8 @@
    592 #~ msgid "Set the default boot menu entry for GRUB."
    593 #~ msgstr "Встановити типовий пункт меню завантаження для GRUB."
    594
    595 -#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
    596 -#~ msgstr "Потребує встановлення GRUB_DEFAULT=saved у %s/default/grub.\\n"
    597 +#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
    598 +#~ msgstr "Потребує встановлення GRUB_DEFAULT=saved у %s/conf.d/grub.\\n"
    599
    600 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
    601 #~ msgstr ""
    602 diff -Naur grub-2.04/po/vi.po grub-2.04-magellan/po/vi.po
    603 --- grub-2.04/po/vi.po 2019-07-04 16:12:06.000000000 +0200
    604 +++ grub-2.04-magellan/po/vi.po 2020-07-07 14:16:27.404532298 +0200
    605 @@ -6726,12 +6726,12 @@
    606
    607 #~ msgid ""
    608 #~ "Syntax errors are detected in generated GRUB config file.\n"
    609 -#~ "Ensure that there are no errors in /etc/default/grub\n"
    610 +#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
    611 #~ "and /etc/grub.d/* files or please file a bug report with\n"
    612 #~ "%s file attached."
    613 #~ msgstr ""
    614 #~ "Các lỗi cú pháp đã được phát hiện trong tập tin cấu hình GRUB đã tạo.\n"
    615 -#~ "Hãy chắc chắn rằng không có lỗi nào trong tập tin /etc/default/grub\n"
    616 +#~ "Hãy chắc chắn rằng không có lỗi nào trong tập tin /etc/conf.d/grub\n"
    617 #~ "và /etc/grub.d/* hoặc báo cáo tập tin lỗi này bằng cách đính\n"
    618 #~ "kèm tập tin %s."
    619
    620 @@ -6785,9 +6785,9 @@
    621 #~ msgid "Set the default boot menu entry for GRUB."
    622 #~ msgstr "Đặt mục menu khởi động mặc định cho GRUB."
    623
    624 -#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
    625 +#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
    626 #~ msgstr ""
    627 -#~ "Cái này yêu cầu cài đặt GRUB_DEFAULT=saved trong %s/default/grub.\\n"
    628 +#~ "Cái này yêu cầu cài đặt GRUB_DEFAULT=saved trong %s/conf.d/grub.\\n"
    629
    630 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
    631 #~ msgstr ""
    632 diff -Naur grub-2.04/util/grub.d/README grub-2.04-magellan/util/grub.d/README
    633 --- grub-2.04/util/grub.d/README 2018-11-24 18:13:02.000000000 +0100
    634 +++ grub-2.04-magellan/util/grub.d/README 2020-07-07 14:20:39.298049153 +0200
    635 @@ -8,4 +8,4 @@
    636 The number namespace in-between is configurable by system installer and/or
    637 administrator. For example, you can add an entry to boot another OS as
    638 01_otheros, 11_otheros, etc, depending on the position you want it to occupy in
    639 -the menu; and then adjust the default setting via /etc/default/grub.
    640 +the menu; and then adjust the default setting via /etc/conf.d/grub.
    641 diff -Naur grub-2.04/util/grub-mkconfig.in grub-2.04-magellan/util/grub-mkconfig.in
    642 --- grub-2.04/util/grub-mkconfig.in 2019-05-20 12:59:36.000000000 +0200
    643 +++ grub-2.04-magellan/util/grub-mkconfig.in 2020-07-07 14:20:25.705236431 +0200
    644 @@ -154,8 +154,8 @@
    645 GRUB_EARLY_INITRD_LINUX_STOCK="intel-uc.img intel-ucode.img amd-uc.img amd-ucode.img early_ucode.cpio microcode.cpio"
    646 fi
    647
    648 -if test -f ${sysconfdir}/default/grub ; then
    649 - . ${sysconfdir}/default/grub
    650 +if test -f ${sysconfdir}/conf.d/grub ; then
    651 + . ${sysconfdir}/conf.d/grub
    652 fi
    653
    654 # XXX: should this be deprecated at some point?
    655 @@ -254,7 +254,7 @@
    656 # DO NOT EDIT THIS FILE
    657 #
    658 # It is automatically generated by $self using templates
    659 -# from ${grub_mkconfig_dir} and settings from ${sysconfdir}/default/grub
    660 +# from ${grub_mkconfig_dir} and settings from ${sysconfdir}/conf.d/grub
    661 #
    662 EOF
    663
    664 @@ -280,7 +280,7 @@
    665 if ! ${grub_script_check} ${grub_cfg}.new; then
    666 # TRANSLATORS: %s is replaced by filename
    667 gettext_printf "Syntax errors are detected in generated GRUB config file.
    668 -Ensure that there are no errors in /etc/default/grub
    669 +Ensure that there are no errors in /etc/conf.d/grub
    670 and /etc/grub.d/* files or please file a bug report with
    671 %s file attached." "${grub_cfg}.new" >&2
    672 echo >&2
    673 diff -Naur grub-2.04/util/grub-set-default.in grub-2.04-magellan/util/grub-set-default.in
    674 --- grub-2.04/util/grub-set-default.in 2018-11-24 18:13:02.000000000 +0100
    675 +++ grub-2.04-magellan/util/grub-set-default.in 2020-07-07 14:20:00.261587161 +0200
    676 @@ -46,7 +46,7 @@
    677 usage () {
    678 gettext_printf "Usage: %s [OPTION] MENU_ENTRY\n" "$self"
    679 gettext "Set the default boot menu entry for GRUB."; echo
    680 - gettext_printf "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\n" "$sysconfdir"
    681 + gettext_printf "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\n" "$sysconfdir"
    682 echo
    683 print_option_help "-h, --help" "$(gettext "print this message and exit")"
    684 print_option_help "-V, --version" "$(gettext "print the version information and exit")"