grub/patches/grub-2.04-confd.patch

diff -Naur grub-2.04/ChangeLog-2015 grub-2.04-magellan/ChangeLog-2015
--- grub-2.04/ChangeLog-2015	2018-11-24 18:13:02.000000000 +0100
+++ grub-2.04-magellan/ChangeLog-2015	2020-07-07 14:09:51.564089996 +0200
@@ -48591,7 +48591,7 @@
 
 	* util/grub.d/00_header.in: Set default gfxmode to `800x600x16'.
 
-	* util/update-grub.in: Add a reference to ${sysconfdir}/default/grub in
+	* util/update-grub.in: Add a reference to ${sysconfdir}/conf.d/grub in
 	the grub.cfg header message.
 
 2007-05-11  Robert Millan  <rmh@aybabtu.com>
diff -Naur grub-2.04/docs/grub.info grub-2.04-magellan/docs/grub.info
--- grub-2.04/docs/grub.info	2019-07-04 16:09:32.000000000 +0200
+++ grub-2.04-magellan/docs/grub.info	2020-07-07 14:10:42.556365715 +0200
@@ -1156,7 +1156,7 @@
 Booting::, and *note Shell-like scripting::), and to disable any system
 provided by their distribution to automatically run 'grub-mkconfig'.
 
-   The file '/etc/default/grub' controls the operation of
+   The file '/etc/conf.d/grub' controls the operation of
 'grub-mkconfig'.  It is sourced by a shell script, and so must be valid
 POSIX shell input; normally, it will just be a sequence of 'KEY=value'
 lines, but if the value contains spaces or other special characters then
@@ -1164,7 +1164,7 @@
 
      GRUB_TERMINAL_INPUT="console serial"
 
-   Valid keys in '/etc/default/grub' are as follows:
+   Valid keys in '/etc/conf.d/grub' are as follows:
 
 'GRUB_DEFAULT'
      The default menu entry.  This may be a number, in which case it
@@ -1755,7 +1755,7 @@
 
    'GRUB_DISABLE_OS_PROBER=true'
 
-   in /etc/default/grub
+   in /etc/conf.d/grub
 
    Then write a grub.cfg (/mnt/boot/grub/grub.cfg):
 
@@ -2546,7 +2546,7 @@
 Some laptop vendors provide an additional power-on button which boots
 another OS. GRUB supports such buttons with the 'GRUB_TIMEOUT_BUTTON',
 'GRUB_TIMEOUT_STYLE_BUTTON', 'GRUB_DEFAULT_BUTTON', and
-'GRUB_BUTTON_CMOS_ADDRESS' variables in default/grub (*note Simple
+'GRUB_BUTTON_CMOS_ADDRESS' variables in conf.d/grub (*note Simple
 configuration::).  'GRUB_TIMEOUT_BUTTON', 'GRUB_TIMEOUT_STYLE_BUTTON',
 and 'GRUB_DEFAULT_BUTTON' are used instead of the corresponding
 variables without the '_BUTTON' suffix when powered on using the special
diff -Naur grub-2.04/docs/grub.texi grub-2.04-magellan/docs/grub.texi
--- grub-2.04/docs/grub.texi	2019-06-24 12:10:28.000000000 +0200
+++ grub-2.04-magellan/docs/grub.texi	2020-07-07 14:11:19.556842039 +0200
@@ -1240,7 +1240,7 @@
 (@pxref{Booting}, and @ref{Shell-like scripting}), and to disable any system
 provided by their distribution to automatically run @command{grub-mkconfig}.
 
-The file @file{/etc/default/grub} controls the operation of
+The file @file{/etc/conf.d/grub} controls the operation of
 @command{grub-mkconfig}.  It is sourced by a shell script, and so must be
 valid POSIX shell input; normally, it will just be a sequence of
 @samp{KEY=value} lines, but if the value contains spaces or other special
@@ -1250,7 +1250,7 @@
 GRUB_TERMINAL_INPUT="console serial"
 @end example
 
-Valid keys in @file{/etc/default/grub} are as follows:
+Valid keys in @file{/etc/conf.d/grub} are as follows:
 
 @table @samp
 @item GRUB_DEFAULT
@@ -1832,7 +1832,7 @@
 
 @code{GRUB_DISABLE_OS_PROBER=true}
 
-in /etc/default/grub
+in /etc/conf.d/grub
 
 Then write a grub.cfg (/mnt/boot/grub/grub.cfg):
 
@@ -2604,7 +2604,7 @@
 Some laptop vendors provide an additional power-on button which boots
 another OS.  GRUB supports such buttons with the @samp{GRUB_TIMEOUT_BUTTON},
 @samp{GRUB_TIMEOUT_STYLE_BUTTON}, @samp{GRUB_DEFAULT_BUTTON}, and
-@samp{GRUB_BUTTON_CMOS_ADDRESS} variables in default/grub (@pxref{Simple
+@samp{GRUB_BUTTON_CMOS_ADDRESS} variables in conf.d/grub (@pxref{Simple
 configuration}).  @samp{GRUB_TIMEOUT_BUTTON},
 @samp{GRUB_TIMEOUT_STYLE_BUTTON}, and @samp{GRUB_DEFAULT_BUTTON} are used
 instead of the corresponding variables without the @samp{_BUTTON} suffix
diff -Naur grub-2.04/po/ast.po grub-2.04-magellan/po/ast.po
--- grub-2.04/po/ast.po	2019-07-04 16:09:53.000000000 +0200
+++ grub-2.04-magellan/po/ast.po	2020-07-07 14:12:14.920061111 +0200
@@ -6700,13 +6700,13 @@
 
 #~ msgid ""
 #~ "Syntax errors are detected in generated GRUB config file.\n"
-#~ "Ensure that there are no errors in /etc/default/grub\n"
+#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
 #~ "and /etc/grub.d/* files or please file a bug report with\n"
 #~ "%s file attached."
 #~ msgstr ""
 #~ "Deteutáronse fallos de sintaxis nel ficheru xeneráu de la\n"
 #~ " configuración de GRUB. Asegúrate que nun heba fallos\n"
-#~ " nos ficheros /etc/default/grub y /etc/grub.d/*, sinón\n"
+#~ " nos ficheros /etc/conf.d/grub y /etc/grub.d/*, sinón\n"
 #~ " rellena un informe de fallos col ficheru de darréu axuntáu\n"
 #~ "%s ."
 
@@ -6765,8 +6765,8 @@
 #~ msgid "Set the default boot menu entry for GRUB."
 #~ msgstr "Afita la entrada predeterminada del menú d'arranque de GRUB."
 
-#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
-#~ msgstr "Esto rique l'axuste GRUB_DEFAULT=saved en %s/default/grub.\\n"
+#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
+#~ msgstr "Esto rique l'axuste GRUB_DEFAULT=saved en %s/conf.d/grub.\\n"
 
 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
 #~ msgstr ""
diff -Naur grub-2.04/po/ca.po grub-2.04-magellan/po/ca.po
--- grub-2.04/po/ca.po	2019-07-04 16:09:53.000000000 +0200
+++ grub-2.04-magellan/po/ca.po	2020-07-07 14:14:51.039873662 +0200
@@ -6751,13 +6751,13 @@
 
 #~ msgid ""
 #~ "Syntax errors are detected in generated GRUB config file.\n"
-#~ "Ensure that there are no errors in /etc/default/grub\n"
+#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
 #~ "and /etc/grub.d/* files or please file a bug report with\n"
 #~ "%s file attached."
 #~ msgstr ""
 #~ "S'han detectat errors de sintaxi al fitxer de configuració del GRUB "
 #~ "generat.\n"
-#~ "Assegureu-vos que no hi ha errors a /etc/default/grub o als fitxers\n"
+#~ "Assegureu-vos que no hi ha errors a /etc/conf.d/grub o als fitxers\n"
 #~ " /etc/grub.d/* o bé envieu un informe d'error adjuntant el fitxer %s "
 
 #~ msgid "done"
@@ -6811,8 +6811,8 @@
 #~ msgid "Set the default boot menu entry for GRUB."
 #~ msgstr "Estableix l'entrada del menú d'arrencada per defecte del GRUB."
 
-#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
-#~ msgstr "Necessita configurar GRUB_DEFAULT=saved a %s/default/grub.\\n"
+#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
+#~ msgstr "Necessita configurar GRUB_DEFAULT=saved a %s/conf.d/grub.\\n"
 
 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
 #~ msgstr ""
diff -Naur grub-2.04/po/da.po grub-2.04-magellan/po/da.po
--- grub-2.04/po/da.po	2019-07-04 16:09:53.000000000 +0200
+++ grub-2.04-magellan/po/da.po	2020-07-07 14:13:31.591984346 +0200
@@ -6718,13 +6718,13 @@
 
 #~ msgid ""
 #~ "Syntax errors are detected in generated GRUB config file.\n"
-#~ "Ensure that there are no errors in /etc/default/grub\n"
+#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
 #~ "and /etc/grub.d/* files or please file a bug report with\n"
 #~ "%s file attached."
 #~ msgstr ""
 #~ "Der blev fundet syntaksfejl i den genererede GRUB-\n"
 #~ "konfigurationsfil.  Sikr dig at der ikke er nogen fejl\n"
-#~ "i filerne /etc/default/grub eller /etc/grub.d/*, eller\n"
+#~ "i filerne /etc/conf.d/grub eller /etc/grub.d/*, eller\n"
 #~ "indsend venligst en fejlrapport med filen %s vedhæftet."
 
 #~ msgid "done"
@@ -6774,8 +6774,8 @@
 #~ msgid "Set the default boot menu entry for GRUB."
 #~ msgstr "Sæt standardmenuindgangen for opstart i GRUB."
 
-#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
-#~ msgstr "Dette kræver at GRUB_DEFAULT=saved angives i %s/default/grub.\\n"
+#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
+#~ msgstr "Dette kræver at GRUB_DEFAULT=saved angives i %s/conf.d/grub.\\n"
 
 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
 #~ msgstr ""
diff -Naur grub-2.04/po/es.po grub-2.04-magellan/po/es.po
--- grub-2.04/po/es.po	2019-07-04 16:09:53.000000000 +0200
+++ grub-2.04-magellan/po/es.po	2020-07-07 14:19:07.685312707 +0200
@@ -6838,13 +6838,13 @@
 
 #~ msgid ""
 #~ "Syntax errors are detected in generated GRUB config file.\n"
-#~ "Ensure that there are no errors in /etc/default/grub\n"
+#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
 #~ "and /etc/grub.d/* files or please file a bug report with\n"
 #~ "%s file attached."
 #~ msgstr ""
 #~ "Se han detectado errores de sintaxis en el fichero de\n"
 #~ "configuración de GRUB generado.\n"
-#~ "Asegurese de que no hay errores en /etc/default/grub\n"
+#~ "Asegurese de que no hay errores en /etc/conf.d/grub\n"
 #~ "en los ficheros /etc/grub.d/* o, por favor, abra una\n"
 #~ "notificación de errores con el fichero %s adjunto."
 
@@ -6898,8 +6898,8 @@
 #~ msgid "Set the default boot menu entry for GRUB."
 #~ msgstr "Establece la entrada del menú predeterminada para GRUB."
 
-#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
-#~ msgstr "Esto requere establecer GRUB_DEFAULT=saved en %s/default/grub.\\n"
+#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
+#~ msgstr "Esto requere establecer GRUB_DEFAULT=saved en %s/conf.d/grub.\\n"
 
 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
 #~ msgstr ""
diff -Naur grub-2.04/po/fi.po grub-2.04-magellan/po/fi.po
--- grub-2.04/po/fi.po	2019-07-04 16:09:53.000000000 +0200
+++ grub-2.04-magellan/po/fi.po	2020-07-07 14:19:27.320041617 +0200
@@ -6737,12 +6737,12 @@
 
 #~ msgid ""
 #~ "Syntax errors are detected in generated GRUB config file.\n"
-#~ "Ensure that there are no errors in /etc/default/grub\n"
+#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
 #~ "and /etc/grub.d/* files or please file a bug report with\n"
 #~ "%s file attached."
 #~ msgstr ""
 #~ "Syntaksivirheita havaittu tuotettaessa GRUB-asetustiedostoa.\n"
-#~ "Varmista, että tiedostoissa /etc/default/grub ja /etc/grub.d/*\n"
+#~ "Varmista, että tiedostoissa /etc/conf.d/grub ja /etc/grub.d/*\n"
 #~ "ei ole mitään virheitä tai tee vikailmoitus tiedosto %s\n"
 #~ "liitteenä."
 
@@ -6799,9 +6799,9 @@
 #~ msgid "Set the default boot menu entry for GRUB."
 #~ msgstr "Aseta käynnistyksen oletusvalikkorivi GRUB:lle"
 
-#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 #~ msgstr ""
-#~ "Tämä vaatii asetuksen GRUB_DEFAULT=saved tiedostossa %s/default/grub.\\n"
+#~ "Tämä vaatii asetuksen GRUB_DEFAULT=saved tiedostossa %s/conf.d/grub.\\n"
 
 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
 #~ msgstr ""
diff -Naur grub-2.04/po/fr.po grub-2.04-magellan/po/fr.po
--- grub-2.04/po/fr.po	2019-07-04 16:09:53.000000000 +0200
+++ grub-2.04-magellan/po/fr.po	2020-07-07 14:16:04.696847860 +0200
@@ -6791,13 +6791,13 @@
 
 #~ msgid ""
 #~ "Syntax errors are detected in generated GRUB config file.\n"
-#~ "Ensure that there are no errors in /etc/default/grub\n"
+#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
 #~ "and /etc/grub.d/* files or please file a bug report with\n"
 #~ "%s file attached."
 #~ msgstr ""
 #~ "Des erreurs de syntaxe sont détectées dans le fichier de configuration\n"
 #~ "de GRUB. Veuillez vérifier qu'il n'y a pas d'erreur dans les fichiers\n"
-#~ "/etc/default/grub et /etc/grub.d/*. Sinon veuillez signaler un bogue\n"
+#~ "/etc/conf.d/grub et /etc/grub.d/*. Sinon veuillez signaler un bogue\n"
 #~ "en joignant le fichier %s."
 
 #~ msgid "done"
@@ -6853,9 +6853,9 @@
 #~ msgid "Set the default boot menu entry for GRUB."
 #~ msgstr "Configurer l'entrée de menu par défaut pour GRUB."
 
-#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 #~ msgstr ""
-#~ "Cela nécessite de configurer GRUB_DEFAULT=saved dans %s/default/grub.\\n"
+#~ "Cela nécessite de configurer GRUB_DEFAULT=saved dans %s/conf.d/grub.\\n"
 
 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
 #~ msgstr ""
diff -Naur grub-2.04/po/gl.po grub-2.04-magellan/po/gl.po
--- grub-2.04/po/gl.po	2019-07-04 16:09:53.000000000 +0200
+++ grub-2.04-magellan/po/gl.po	2020-07-07 14:14:24.366246033 +0200
@@ -6847,13 +6847,13 @@
 
 #~ msgid ""
 #~ "Syntax errors are detected in generated GRUB config file.\n"
-#~ "Ensure that there are no errors in /etc/default/grub\n"
+#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
 #~ "and /etc/grub.d/* files or please file a bug report with\n"
 #~ "%s file attached."
 #~ msgstr ""
 #~ "Detectáronse erros sintácticos no ficheiro de configuración do GRUB "
 #~ "xerado.\n"
-#~ "Asegúrese de que non hai erros en /etc/default/grub\n"
+#~ "Asegúrese de que non hai erros en /etc/conf.d/grub\n"
 #~ "e nos ficheiros /etc/grub.d/* ou escriba un informe de erro co\n"
 #~ "%s ficheiro anexado."
 
@@ -6900,9 +6900,9 @@
 #~ msgid "Set the default boot menu entry for GRUB."
 #~ msgstr "Estabelecer a entrada predeterminada do menú de arranque no GRUB."
 
-#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 #~ msgstr ""
-#~ "Isto require a opción GRUB_PREDETERMINADO=gardada en %s/default/grub.\\n"
+#~ "Isto require a opción GRUB_PREDETERMINADO=gardada en %s/conf.d/grub.\\n"
 
 #~ msgid ""
 #~ "Requested serial terminal but GRUB_SERIAL_COMMAND is unspecified. Default "
diff -Naur grub-2.04/po/hr.po grub-2.04-magellan/po/hr.po
--- grub-2.04/po/hr.po	2019-07-04 16:09:53.000000000 +0200
+++ grub-2.04-magellan/po/hr.po	2020-07-07 14:13:07.894316606 +0200
@@ -6677,12 +6677,12 @@
 
 #~ msgid ""
 #~ "Syntax errors are detected in generated GRUB config file.\n"
-#~ "Ensure that there are no errors in /etc/default/grub\n"
+#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
 #~ "and /etc/grub.d/* files or please file a bug report with\n"
 #~ "%s file attached."
 #~ msgstr ""
 #~ "Greške sintakse su otkrivene u stvorenoj GRUB datoteci podešavanja.\n"
-#~ "Pobrinite se da ne postoje greške u /etc/default/grub\n"
+#~ "Pobrinite se da ne postoje greške u /etc/conf.d/grub\n"
 #~ "i /etc/grub.d/* datotekama ili pošaljite izvješće greške s\n"
 #~ "%s priloženoj datoteci."
 
@@ -6734,9 +6734,9 @@
 #~ msgid "Set the default boot menu entry for GRUB."
 #~ msgstr "Postavi zadanu stavku izbornika pokretanja za GRUB."
 
-#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 #~ msgstr ""
-#~ "Ovo zahtijeva postavku GRUB_DEFAULT=spremljenju u %s/default/grub.\\n"
+#~ "Ovo zahtijeva postavku GRUB_DEFAULT=spremljenju u %s/conf.d/grub.\\n"
 
 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
 #~ msgstr ""
diff -Naur grub-2.04/po/hu.po grub-2.04-magellan/po/hu.po
--- grub-2.04/po/hu.po	2019-07-04 16:12:05.000000000 +0200
+++ grub-2.04-magellan/po/hu.po	2020-07-07 14:16:48.494239492 +0200
@@ -6730,12 +6730,12 @@
 
 #~ msgid ""
 #~ "Syntax errors are detected in generated GRUB config file.\n"
-#~ "Ensure that there are no errors in /etc/default/grub\n"
+#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
 #~ "and /etc/grub.d/* files or please file a bug report with\n"
 #~ "%s file attached."
 #~ msgstr ""
 #~ "Szintaktikai hibák találhatók az előállított GRUB beállítófájlban.\n"
-#~ "Győződjön meg arról, hogy nincsenek hibák a /etc/default/grub\n"
+#~ "Győződjön meg arról, hogy nincsenek hibák a /etc/conf.d/grub\n"
 #~ "és a /etc/grub.d/* fájlokban, vagy küldjön egy hibajelentést a(z)\n"
 #~ "%s fájllal mellékelve."
 
@@ -6789,9 +6789,9 @@
 #~ msgstr ""
 #~ "A GRUB alapértelmezett rendszerindítási menübejegyzésének beállítása."
 
-#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 #~ msgstr ""
-#~ "Ez a GRUB_DEFAULT=saved beállítást igényli a(z) %s/default/grub fájlban."
+#~ "Ez a GRUB_DEFAULT=saved beállítást igényli a(z) %s/conf.d/grub fájlban."
 #~ "\\n"
 
 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
diff -Naur grub-2.04/po/lt.po grub-2.04-magellan/po/lt.po
--- grub-2.04/po/lt.po	2019-07-04 16:12:05.000000000 +0200
+++ grub-2.04-magellan/po/lt.po	2020-07-07 14:18:31.386814297 +0200
@@ -6637,12 +6637,12 @@
 
 #~ msgid ""
 #~ "Syntax errors are detected in generated GRUB config file.\n"
-#~ "Ensure that there are no errors in /etc/default/grub\n"
+#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
 #~ "and /etc/grub.d/* files or please file a bug report with\n"
 #~ "%s file attached."
 #~ msgstr ""
 #~ "Sukurtame GRUB konfigūracijos faile aptikta klaidų.\n"
-#~ "Įsitikinkite, ar nėra klaidų /etc/default/grub\n"
+#~ "Įsitikinkite, ar nėra klaidų /etc/conf.d/grub\n"
 #~ "ir /etc/grub.d/* failuose arba praneškite apie klaidą\n"
 #~ "prisegdami %s failą."
 
@@ -6673,8 +6673,8 @@
 #~ msgid "Set the default boot menu entry for GRUB."
 #~ msgstr "Nurodyti numatytąjį numatytąjį paleidimo GRUB meniu įrašą."
 
-#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
-#~ msgstr "Tam reikia įrašyti GRUB_DEFAULT=saved faile %s/default/grub.\\n"
+#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
+#~ msgstr "Tam reikia įrašyti GRUB_DEFAULT=saved faile %s/conf.d/grub.\\n"
 
 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
 #~ msgstr ""
diff -Naur grub-2.04/po/nb.po grub-2.04-magellan/po/nb.po
--- grub-2.04/po/nb.po	2019-07-04 16:12:05.000000000 +0200
+++ grub-2.04-magellan/po/nb.po	2020-07-07 14:12:45.106636556 +0200
@@ -6676,12 +6676,12 @@
 
 #~ msgid ""
 #~ "Syntax errors are detected in generated GRUB config file.\n"
-#~ "Ensure that there are no errors in /etc/default/grub\n"
+#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
 #~ "and /etc/grub.d/* files or please file a bug report with\n"
 #~ "%s file attached."
 #~ msgstr ""
 #~ "Generert GRUB-oppsettsfil inneholder syntaksfeil.\n"
-#~ "Kontroller at grunnlaget i /etc/default/grub og /etc/grub.d/*\n"
+#~ "Kontroller at grunnlaget i /etc/conf.d/grub og /etc/grub.d/*\n"
 #~ "ikke innheholder feil, og send inn en feilrapport\n"
 #~ "med %s vedlagt hvis du fremdeles har problemer."
 
@@ -6733,9 +6733,9 @@
 #~ msgid "Set the default boot menu entry for GRUB."
 #~ msgstr "Velg standardoppføring på GRUB-oppstartsmenyen."
 
-#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 #~ msgstr ""
-#~ "Dette krever at du gir en verdi til «GRUB_DEFAULT=» i fila %s/default/"
+#~ "Dette krever at du gir en verdi til «GRUB_DEFAULT=» i fila %s/conf.d/"
 #~ "grub.\\n"
 
 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
diff -Naur grub-2.04/po/nl.po grub-2.04-magellan/po/nl.po
--- grub-2.04/po/nl.po	2019-07-04 16:12:05.000000000 +0200
+++ grub-2.04-magellan/po/nl.po	2020-07-07 14:17:09.383949705 +0200
@@ -6758,13 +6758,13 @@
 
 #~ msgid ""
 #~ "Syntax errors are detected in generated GRUB config file.\n"
-#~ "Ensure that there are no errors in /etc/default/grub\n"
+#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
 #~ "and /etc/grub.d/* files or please file a bug report with\n"
 #~ "%s file attached."
 #~ msgstr ""
 #~ "Er zijn syntaxfouten gevonden in het aangemaakte GRUB-"
 #~ "configuratiebestand.\n"
-#~ "Verzeker u ervan dat er geen fouten zitten in het bestand /etc/default/"
+#~ "Verzeker u ervan dat er geen fouten zitten in het bestand /etc/conf.d/"
 #~ "grub\n"
 #~ "noch in de bestanden in /etc/grub.d/.  Rapporteer anders een fout, met "
 #~ "het\n"
@@ -6817,9 +6817,9 @@
 #~ msgid "Set the default boot menu entry for GRUB."
 #~ msgstr "Het standaardmenu-item voor GRUB instellen."
 
-#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 #~ msgstr ""
-#~ "Dit vereist het instellen van GRUB_DEFAULT=saved in %s/default/grub.\\n"
+#~ "Dit vereist het instellen van GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 
 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
 #~ msgstr "MENU-ITEM is het nummer, de titel, of het ID van een menu-item."
diff -Naur grub-2.04/po/ru.po grub-2.04-magellan/po/ru.po
--- grub-2.04/po/ru.po	2019-07-04 16:12:05.000000000 +0200
+++ grub-2.04-magellan/po/ru.po	2020-07-07 14:15:42.471157017 +0200
@@ -6704,12 +6704,12 @@
 
 #~ msgid ""
 #~ "Syntax errors are detected in generated GRUB config file.\n"
-#~ "Ensure that there are no errors in /etc/default/grub\n"
+#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
 #~ "and /etc/grub.d/* files or please file a bug report with\n"
 #~ "%s file attached."
 #~ msgstr ""
 #~ "В сгенерированном файле настроек GRUB обнаружены синтаксические ошибки.\n"
-#~ "Убедитесь, что в файлах /etc/default/grub\n"
+#~ "Убедитесь, что в файлах /etc/conf.d/grub\n"
 #~ "и /etc/grub.d/* ошибки отсутствуют или пошлите сообщение об ошибке\n"
 #~ "в прикреплённым файлом %s."
 
@@ -6760,8 +6760,8 @@
 #~ msgid "Set the default boot menu entry for GRUB."
 #~ msgstr "Назначает пункт меню GRUB для загрузки по умолчанию."
 
-#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
-#~ msgstr "Для этого требуется строка GRUB_DEFAULT=saved в %s/default/grub.\\n"
+#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
+#~ msgstr "Для этого требуется строка GRUB_DEFAULT=saved в %s/conf.d/grub.\\n"
 
 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
 #~ msgstr ""
diff -Naur grub-2.04/po/sl.po grub-2.04-magellan/po/sl.po
--- grub-2.04/po/sl.po	2019-07-04 16:12:05.000000000 +0200
+++ grub-2.04-magellan/po/sl.po	2020-07-07 14:17:42.783486856 +0200
@@ -6951,12 +6951,12 @@
 
 #~ msgid ""
 #~ "Syntax errors are detected in generated GRUB config file.\n"
-#~ "Ensure that there are no errors in /etc/default/grub\n"
+#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
 #~ "and /etc/grub.d/* files or please file a bug report with\n"
 #~ "%s file attached."
 #~ msgstr ""
 #~ "V ustvarjeni nastavitveni datoteki GRUB so zaznane napake\n"
-#~ " skladnje. Prepričajte se, da v datotekah /etc/default/grub in\n"
+#~ " skladnje. Prepričajte se, da v datotekah /etc/conf.d/grub in\n"
 #~ "/etc/grub.d/* ni napak ali pa pošljite poročilo o hrošču s pripeto\n"
 #~ "datoteko %s."
 
diff -Naur grub-2.04/po/sr.po grub-2.04-magellan/po/sr.po
--- grub-2.04/po/sr.po	2019-07-04 16:12:05.000000000 +0200
+++ grub-2.04-magellan/po/sr.po	2020-07-07 14:15:17.687502134 +0200
@@ -6696,12 +6696,12 @@
 
 #~ msgid ""
 #~ "Syntax errors are detected in generated GRUB config file.\n"
-#~ "Ensure that there are no errors in /etc/default/grub\n"
+#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
 #~ "and /etc/grub.d/* files or please file a bug report with\n"
 #~ "%s file attached."
 #~ msgstr ""
 #~ "Откривене су грешке синтаксе у створеној датотеци подешавања ГРУБ-а.\n"
-#~ "Проверите да ли има грешака у датотекама „/etc/default/grub“\n"
+#~ "Проверите да ли има грешака у датотекама „/etc/conf.d/grub“\n"
 #~ "и „/etc/grub.d/*“ или попуните извештај о грешкама\n"
 #~ "и приложите датотеку „%s“."
 
@@ -6755,8 +6755,8 @@
 #~ msgid "Set the default boot menu entry for GRUB."
 #~ msgstr "Подешава основни унос изборника подизања за ГРУБ."
 
-#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
-#~ msgstr "Ово захтева подешавање „GRUB_DEFAULT=saved“ у „%s/default/grub“.\\n"
+#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
+#~ msgstr "Ово захтева подешавање „GRUB_DEFAULT=saved“ у „%s/conf.d/grub“.\\n"
 
 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
 #~ msgstr ""
diff -Naur grub-2.04/po/sv.po grub-2.04-magellan/po/sv.po
--- grub-2.04/po/sv.po	2019-07-04 16:12:05.000000000 +0200
+++ grub-2.04-magellan/po/sv.po	2020-07-07 14:18:07.620143034 +0200
@@ -6674,12 +6674,12 @@
 
 #~ msgid ""
 #~ "Syntax errors are detected in generated GRUB config file.\n"
-#~ "Ensure that there are no errors in /etc/default/grub\n"
+#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
 #~ "and /etc/grub.d/* files or please file a bug report with\n"
 #~ "%s file attached."
 #~ msgstr ""
 #~ "Syntaxfel upptäcktes i den genererade GRUB-konfigurationsfilen.\n"
-#~ "Kontrollera att det inte finns några fel i /etc/default/grub-\n"
+#~ "Kontrollera att det inte finns några fel i /etc/conf.d/grub-\n"
 #~ "och /etc/grub.d/*-filerna eller skicka in en felrapport med\n"
 #~ "bifogad %s-fil."
 
@@ -6730,8 +6730,8 @@
 #~ msgid "Set the default boot menu entry for GRUB."
 #~ msgstr "Ange standardpost för GRUBs startmeny."
 
-#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
-#~ msgstr "Detta kräver inställningen GRUB_DEFAULT=saved i %s/default/grub.\\n"
+#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
+#~ msgstr "Detta kräver inställningen GRUB_DEFAULT=saved i %s/conf.d/grub.\\n"
 
 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
 #~ msgstr ""
diff -Naur grub-2.04/po/tr.po grub-2.04-magellan/po/tr.po
--- grub-2.04/po/tr.po	2019-07-04 16:12:05.000000000 +0200
+++ grub-2.04-magellan/po/tr.po	2020-07-07 14:18:44.824628539 +0200
@@ -6606,9 +6606,9 @@
 #~ msgid "Set the default boot menu entry for GRUB."
 #~ msgstr "GRUB için varsayılan önyükleme menü girdisini ayarla."
 
-#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 #~ msgstr ""
-#~ "Bu, %s/default/grub içinde GRUB_DEFAULT=saved olmasını gerektirir.\\n"
+#~ "Bu, %s/conf.d/grub içinde GRUB_DEFAULT=saved olmasını gerektirir.\\n"
 
 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
 #~ msgstr ""
diff -Naur grub-2.04/po/uk.po grub-2.04-magellan/po/uk.po
--- grub-2.04/po/uk.po	2019-07-04 16:12:05.000000000 +0200
+++ grub-2.04-magellan/po/uk.po	2020-07-07 14:13:57.183626048 +0200
@@ -6764,12 +6764,12 @@
 
 #~ msgid ""
 #~ "Syntax errors are detected in generated GRUB config file.\n"
-#~ "Ensure that there are no errors in /etc/default/grub\n"
+#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
 #~ "and /etc/grub.d/* files or please file a bug report with\n"
 #~ "%s file attached."
 #~ msgstr ""
 #~ "Виявлено синтаксичні помилки у файлі налаштувань GRUB.\n"
-#~ "Переконайтеся, що у файлах /etc/default/grub і /etc/grub.d/*\n"
+#~ "Переконайтеся, що у файлах /etc/conf.d/grub і /etc/grub.d/*\n"
 #~ "немає помилок, будь ласка, створіть звіт щодо вади з\n"
 #~ "долученням файла %s."
 
@@ -6824,8 +6824,8 @@
 #~ msgid "Set the default boot menu entry for GRUB."
 #~ msgstr "Встановити типовий пункт меню завантаження для GRUB."
 
-#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
-#~ msgstr "Потребує встановлення GRUB_DEFAULT=saved у %s/default/grub.\\n"
+#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
+#~ msgstr "Потребує встановлення GRUB_DEFAULT=saved у %s/conf.d/grub.\\n"
 
 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
 #~ msgstr ""
diff -Naur grub-2.04/po/vi.po grub-2.04-magellan/po/vi.po
--- grub-2.04/po/vi.po	2019-07-04 16:12:06.000000000 +0200
+++ grub-2.04-magellan/po/vi.po	2020-07-07 14:16:27.404532298 +0200
@@ -6726,12 +6726,12 @@
 
 #~ msgid ""
 #~ "Syntax errors are detected in generated GRUB config file.\n"
-#~ "Ensure that there are no errors in /etc/default/grub\n"
+#~ "Ensure that there are no errors in /etc/conf.d/grub\n"
 #~ "and /etc/grub.d/* files or please file a bug report with\n"
 #~ "%s file attached."
 #~ msgstr ""
 #~ "Các lỗi cú pháp đã được phát hiện trong tập tin cấu hình GRUB đã tạo.\n"
-#~ "Hãy chắc chắn rằng không có lỗi nào trong tập tin /etc/default/grub\n"
+#~ "Hãy chắc chắn rằng không có lỗi nào trong tập tin /etc/conf.d/grub\n"
 #~ "và /etc/grub.d/* hoặc báo cáo tập tin lỗi này bằng cách đính\n"
 #~ "kèm tập tin %s."
 
@@ -6785,9 +6785,9 @@
 #~ msgid "Set the default boot menu entry for GRUB."
 #~ msgstr "Đặt mục menu khởi động mặc định cho GRUB."
 
-#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\\n"
+#~ msgid "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\\n"
 #~ msgstr ""
-#~ "Cái này yêu cầu cài đặt GRUB_DEFAULT=saved trong %s/default/grub.\\n"
+#~ "Cái này yêu cầu cài đặt GRUB_DEFAULT=saved trong %s/conf.d/grub.\\n"
 
 #~ msgid "MENU_ENTRY is a number, a menu item title or a menu item identifier."
 #~ msgstr ""
diff -Naur grub-2.04/util/grub.d/README grub-2.04-magellan/util/grub.d/README
--- grub-2.04/util/grub.d/README	2018-11-24 18:13:02.000000000 +0100
+++ grub-2.04-magellan/util/grub.d/README	2020-07-07 14:20:39.298049153 +0200
@@ -8,4 +8,4 @@
 The number namespace in-between is configurable by system installer and/or
 administrator.  For example, you can add an entry to boot another OS as
 01_otheros, 11_otheros, etc, depending on the position you want it to occupy in
-the menu; and then adjust the default setting via /etc/default/grub.
+the menu; and then adjust the default setting via /etc/conf.d/grub.
diff -Naur grub-2.04/util/grub-mkconfig.in grub-2.04-magellan/util/grub-mkconfig.in
--- grub-2.04/util/grub-mkconfig.in	2019-05-20 12:59:36.000000000 +0200
+++ grub-2.04-magellan/util/grub-mkconfig.in	2020-07-07 14:20:25.705236431 +0200
@@ -154,8 +154,8 @@
 	GRUB_EARLY_INITRD_LINUX_STOCK="intel-uc.img intel-ucode.img amd-uc.img amd-ucode.img early_ucode.cpio microcode.cpio"
 fi
 
-if test -f ${sysconfdir}/default/grub ; then
-  . ${sysconfdir}/default/grub
+if test -f ${sysconfdir}/conf.d/grub ; then
+  . ${sysconfdir}/conf.d/grub
 fi
 
 # XXX: should this be deprecated at some point?
@@ -254,7 +254,7 @@
 # DO NOT EDIT THIS FILE
 #
 # It is automatically generated by $self using templates
-# from ${grub_mkconfig_dir} and settings from ${sysconfdir}/default/grub
+# from ${grub_mkconfig_dir} and settings from ${sysconfdir}/conf.d/grub
 #
 EOF
 
@@ -280,7 +280,7 @@
   if ! ${grub_script_check} ${grub_cfg}.new; then
     # TRANSLATORS: %s is replaced by filename
     gettext_printf "Syntax errors are detected in generated GRUB config file.
-Ensure that there are no errors in /etc/default/grub
+Ensure that there are no errors in /etc/conf.d/grub
 and /etc/grub.d/* files or please file a bug report with
 %s file attached." "${grub_cfg}.new" >&2
     echo >&2
diff -Naur grub-2.04/util/grub-set-default.in grub-2.04-magellan/util/grub-set-default.in
--- grub-2.04/util/grub-set-default.in	2018-11-24 18:13:02.000000000 +0100
+++ grub-2.04-magellan/util/grub-set-default.in	2020-07-07 14:20:00.261587161 +0200
@@ -46,7 +46,7 @@
 usage () {
     gettext_printf "Usage: %s [OPTION] MENU_ENTRY\n" "$self"
     gettext "Set the default boot menu entry for GRUB."; echo
-    gettext_printf "This requires setting GRUB_DEFAULT=saved in %s/default/grub.\n" "$sysconfdir"
+    gettext_printf "This requires setting GRUB_DEFAULT=saved in %s/conf.d/grub.\n" "$sysconfdir"
     echo
     print_option_help "-h, --help" "$(gettext "print this message and exit")"
     print_option_help "-V, --version" "$(gettext "print the version information and exit")"