diff options
author | Scott Long <scottl@FreeBSD.org> | 2003-12-21 17:16:44 +0000 |
---|---|---|
committer | Scott Long <scottl@FreeBSD.org> | 2003-12-21 17:16:44 +0000 |
commit | 0e1cbf3725b7f893da0c2622d7224dddb845cbfc (patch) | |
tree | 641ebf820f8dff0f5905c3ef60072f03ac1dd579 /usr.sbin/sysinstall | |
parent | d562e82becf2e876e1ef6cb6d8d7e0ea82f92020 (diff) | |
download | src-0e1cbf3725b7f893da0c2622d7224dddb845cbfc.tar.gz src-0e1cbf3725b7f893da0c2622d7224dddb845cbfc.zip |
Teach the Fixit environment how to deal with a dynamic root. Symlink
/libexec to /mnt2/libexec, and execute /mnt2/rescue/ldconfig to add
the /mnt2/lib and /mnt2/usr/lib library directories. Thanks to John Baldwin
for working to track this down.
Submitted by: jhb
Notes
Notes:
svn path=/head/; revision=123707
Diffstat (limited to 'usr.sbin/sysinstall')
-rw-r--r-- | usr.sbin/sysinstall/install.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index 3d5a7bd0e107..f2c5318aba88 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -354,20 +354,20 @@ installFixitCDROM(dialogMenuItem *self) */ if (!file_readable("/var/run/ld.so.hints")) { Mkdir("/var/run"); - if (vsystem("/mnt2/sbin/ldconfig -s /mnt2/usr/lib")) { + if (vsystem("/mnt2/rescue/ldconfig -s /mnt2/lib /mnt2/usr/lib")) { msgConfirm("Warning: ldconfig could not create the ld.so hints file.\n" "Dynamic executables from the disc likely won't work."); } } /* Yet more iggly hardcoded pathnames. */ - Mkdir("/usr/libexec"); - if (!file_readable("/usr/libexec/ld.so") && file_readable("/mnt2/usr/libexec/ld.so")) { - if (symlink("/mnt2/usr/libexec/ld.so", "/usr/libexec/ld.so")) + Mkdir("/libexec"); + if (!file_readable("/libexec/ld.so") && file_readable("/mnt2/libexec/ld.so")) { + if (symlink("/mnt2/libexec/ld.so", "/libexec/ld.so")) msgDebug("Couldn't link to ld.so - not necessarily a problem for ELF\n"); } - if (!file_readable("/usr/libexec/ld-elf.so.1")) { - if (symlink("/mnt2/usr/libexec/ld-elf.so.1", "/usr/libexec/ld-elf.so.1")) { + if (!file_readable("/libexec/ld-elf.so.1")) { + if (symlink("/mnt2/libexec/ld-elf.so.1", "/libexec/ld-elf.so.1")) { msgConfirm("Warning: could not create the symlink for ld-elf.so.1\n" "Dynamic executables from the disc likely won't work."); } |