templates: Start pci-arbiter before acpi on Hurd

acpi actually needs to access PCI, while pci-arbiter will not be making
use of ACPI, so we need to start acpi first.

Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
index b317a4b142a1c03c8b1061f39a7de78245c03c6d..7d1e463910475084fb406659cd9e256ecdfbb0b7 100644 (file)
--- a/util/grub.d/10_hurd.in
+++ b/util/grub.d/10_hurd.in
@@ -68,18 +68,18 @@ for i in /hurd/${hurd_fs}.static /hurd/exec ; do
   fi
 done
 
-if test -e '/hurd/acpi.static' ; then
-  acpi=true
-else
-  acpi=false
-fi
-
 if test -e '/hurd/pci-arbiter.static' ; then
   pci_arbiter=true
 else
   pci_arbiter=false
 fi
 
+if test -e '/hurd/acpi.static' ; then
+  acpi=true
+else
+  acpi=false
+fi
+
 if test -e '/hurd/rumpdisk.static' ; then
   rumpdisk=true
 else
@@ -159,35 +159,35 @@ EOF
        echo            '$(echo "$message" | grub_quote)'
 EOF
 
-  if [ "$acpi" = true ] ; then
-    if [ "$pci_arbiter" = true ] ; then
-      next_task='${pci-task}'
+  if [ "$pci_arbiter" = true ] ; then
+    if [ "$acpi" = true ] ; then
+      next_task='${acpi-task}'
     elif [ "$rumpdisk" = true ] ; then
       next_task='${disk-task}'
     else
       next_task='${fs-task}'
     fi
     sed "s/^/$submenu_indentation/" << EOF
-       module          /hurd/acpi.static acpi \\
+       module          /hurd/pci-arbiter.static pci-arbiter \\
                        $host_ports \\
                        --next-task='$next_task' \\
-                       '\$(acpi-task=task-create)' $resume_task
+                       '\$(pci-task=task-create)' $resume_task
 EOF
     host_ports=""
     resume_task=""
   fi
 
-  if [ "$pci_arbiter" = true ] ; then
+  if [ "$acpi" = true ] ; then
     if [ "$rumpdisk" = true ] ; then
       next_task='${disk-task}'
     else
       next_task='${fs-task}'
     fi
     sed "s/^/$submenu_indentation/" << EOF
-       module          /hurd/pci-arbiter.static pci-arbiter \\
+       module          /hurd/acpi.static acpi \\
                        $host_ports \\
                        --next-task='$next_task' \\
-                       '\$(pci-task=task-create)' $resume_task
+                       '\$(acpi-task=task-create)' $resume_task
 EOF
     host_ports=""
     resume_task=""