Bug#1006496: hurd: transfer options from d-i to installed system

[Samuel Thibault]

Hello,

Here is yet another refreshed patch for 2.14.

Would it be possible to know what is needed to get this integrated?

Thanks,
Samuel
-------------- next part --------------
Index: grub2-2.14/debian/config.in
===================================================================
--- grub2-2.14.orig/debian/config.in
+++ grub2-2.14/debian/config.in
@@ -51,6 +51,9 @@ fi
 if [ "${GRUB_CMDLINE_LINUX_DEFAULT+set}" = set ]; then
   db_set grub2/linux_cmdline_default "$GRUB_CMDLINE_LINUX_DEFAULT"
 fi
+if [ "${GRUB_CMDLINE_GNUMACH+set}" = set ]; then
+  db_set grub2/gnumach_cmdline "$GRUB_CMDLINE_GNUMACH"
+fi
 # Watch for the inverted logic here...
 if [ "${GRUB_DISABLE_OS_PROBER+set}" = set ]; then
   if [ "${GRUB_DISABLE_OS_PROBER}" = "false" ]; then
@@ -73,8 +76,16 @@ case @PACKAGE@ in
   ;;
 esac
 
-db_input ${priority} grub2/linux_cmdline || true
-db_input medium grub2/linux_cmdline_default || true
+case `dpkg --print-architecture` in
+  hurd-*)
+    db_input ${priority} grub2/gnumach_cmdline || true
+  ;;
+  *)
+    db_input ${priority} grub2/linux_cmdline || true
+    db_input medium grub2/linux_cmdline_default || true
+  ;;
+esac
+
 db_input low grub2/enable_os_prober || true
 case @PACKAGE@ in
   grub-*efi*)
Index: grub2-2.14/debian/default/grub
===================================================================
--- grub2-2.14.orig/debian/default/grub
+++ grub2-2.14/debian/default/grub
@@ -8,6 +8,7 @@ GRUB_TIMEOUT=@DEFAULT_TIMEOUT@
 GRUB_DISTRIBUTOR=`( . /etc/os-release && echo ${NAME} )`
 GRUB_CMDLINE_LINUX_DEFAULT="@DEFAULT_CMDLINE@"
 GRUB_CMDLINE_LINUX=""
+GRUB_CMDLINE_GNUMACH=""
 
 # If your computer has multiple operating systems installed, then you
 # probably want to run os-prober. However, if your computer is a host
Index: grub2-2.14/debian/postinst.in
===================================================================
--- grub2-2.14.orig/debian/postinst.in
+++ grub2-2.14/debian/postinst.in
@@ -278,6 +278,7 @@ case "$1" in
 
     apply_conf_tweaks "$conf_files" merge_debconf_into_conf GRUB_CMDLINE_LINUX grub2/linux_cmdline
     apply_conf_tweaks "$conf_files" merge_debconf_into_conf GRUB_CMDLINE_LINUX_DEFAULT grub2/linux_cmdline_default
+    apply_conf_tweaks "$conf_files" merge_debconf_into_conf GRUB_CMDLINE_GNUMACH grub2/gnumach_cmdline
 
     # Horrible stuff here, as the os-prober option is a negative
     # setting (GRUB_DISABLE_OS_PROBER). To not confuse people with
Index: grub2-2.14/debian/templates.in
===================================================================
--- grub2-2.14.orig/debian/templates.in
+++ grub2-2.14/debian/templates.in
@@ -12,6 +12,13 @@ _Description: Linux default command line
  The following string will be used as Linux parameters for the default menu
  entry but not for the recovery mode.
 
+Template: grub2/gnumach_cmdline
+Type: string
+_Description: GNU Mach command line:
+ The following GNU Mach command line was extracted from /etc/default/grub.
+ Please verify that it is correct, and modify it if necessary. The command line
+ is allowed to be empty.
+
 Template: grub2/force_efi_extra_removable
 Type: boolean
 Default: false