tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util/grub.d/10_hurd.in: Find proper ld.so on 64-bit systems

Browse Source 
The 64-bit ABI defines ld.so to be /lib/ld-x86-64.so.1.

Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Samuel Thibault 2024-01-23 21:47:56 +01:00 committed by Daniel Kiper
parent a8c0504515
commit 9e1b18fc17
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
util/grub.d/10_hurd.in
View File

@ -91,7 +91,14 @@ if ${at_least_one} ; then : ; else
exit 0 exit 0
fi fi
if ${all_of_them} && test -e /lib/ld.so.1 ; then : ; else if test -e '/lib/ld.so.1' ; then
LD_SO=/lib/ld.so.1
fi
if test -e '/lib/ld-x86-64.so.1' ; then
LD_SO=/lib/ld-x86-64.so.1
fi
if ${all_of_them} && test -n "$LD_SO" ; then : ; else
gettext "Some Hurd stuff found, but not enough to boot." >&2 gettext "Some Hurd stuff found, but not enough to boot." >&2
echo >&2 echo >&2
exit 1 exit 1
@ -210,7 +217,7 @@ EOF
$host_ports \\ $host_ports \\
--exec-server-task='\${exec-task}' -T typed '\${root}' \\ --exec-server-task='\${exec-task}' -T typed '\${root}' \\
'\$(fs-task=task-create)' $resume_task '\$(fs-task=task-create)' $resume_task
module /lib/ld.so.1 exec /hurd/exec '\$(exec-task=task-create)' module $LD_SO exec /hurd/exec '\$(exec-task=task-create)'
} }
EOF EOF