Hello, Here is a refreshed patch.
Samuel Samuel Thibault, le sam. 01 juil. 2023 15:27:39 +0200, a ecrit: > Hello, > > Ping on this? > > Samuel Thibault, le sam. 26 févr. 2022 13:00:41 +0100, a ecrit: > > Source: grub2 > > Version: 2.06-2 > > Severity: normal > > Tags: patch > > > > Hello, > > > > It is useful for people to see the Linux kernel options they pass to d-i > > to be propagated to the installed system, e.g. for serial console setup, > > disk probing etc. We would like to have this propagation performed for > > hurd as well, the attach patch implements this. > > > > (I have already made the d-i grub-installer package preseed > > grub2/gnumach_cmdline) > > > > Samuel
--- config.in.original 2022-02-24 22:43:14.000000000 +0000 +++ config.in 2022-02-24 22:46:16.000000000 +0000 @@ -58,6 +58,9 @@ 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 @@ -72,8 +75,16 @@ ;; esac -db_input ${priority} grub2/linux_cmdline || true -db_input medium grub2/linux_cmdline_default || true +case `dpkg --print-architecture` in + hurd-*) + db_input medium 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*) --- postinst.in.original 2022-02-24 22:44:15.000000000 +0000 +++ postinst.in 2022-02-24 22:44:23.000000000 +0000 @@ -392,6 +392,7 @@ 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 --- templates.in.original 2022-02-24 22:46:36.000000000 +0000 +++ templates.in 2022-02-24 22:47:12.000000000 +0000 @@ -12,6 +12,13 @@ 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 --- default/grub.original 2022-02-26 11:56:38.000000000 +0000 +++ default/grub 2022-02-24 22:43:55.000000000 +0000 @@ -8,6 +8,7 @@ GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian` 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