d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Teach the Fixit environment how to deal with a dynamic root. Symlink

Browse Source 
/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
This commit is contained in:
Scott Long 2003-12-21 17:16:44 +00:00
parent d562e82bec
commit 0e1cbf3725
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/sade/install.c
View File

@ -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.");
}

12
usr.sbin/sysinstall/install.c
View File

@ -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.");
}