diff --git a/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml b/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml index 0a937d5c88..e2ca00371d 100644 --- a/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml +++ b/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml @@ -1,7 +1,7 @@ @@ -103,7 +103,7 @@ linux - Installing Linux Emulation in 2.2.2-RELEASE and later + Installing Linux Emulation in 2.2.2-RELEASE and later 2.2 versions It is no longer necessary to specify options LINUX or options COMPAT_LINUX. Linux @@ -132,7 +132,7 @@ fi - If you want to verify it is running, modstat will do that: + If you want to verify that the LKM is running, modstat will do that: &prompt.user; modstat Type Id Off Loadaddr Size Info Rev Module Name @@ -151,6 +151,55 @@ options LINUX configuration section. + + Installing Linux Emulation in 3.0-RELEASE and later + + It is no longer necessary to specify options + LINUX or options COMPAT_LINUX. Linux + emulation is done with an KLD object (“Kernel LoaDable object”) + so it can be installed on the fly without having to reboot. You will + need the following things in your startup files, however: + + + + In /etc/rc.conf, you need the following + line: + + +linux_enable=YES + + + + This, in turn, triggers the following action in + /etc/rc.i386: + + +# Start the Linux binary emulation if requested. +if [ "X${linux_enable}" = X"YES" ]; then echo -n ' + linux'; linux > /dev/null 2>&1 +fi + + + + If you want to verify that the KLD is loaded, kldstat will do that: + + &prompt.user; kldstat +Id Refs Address Size Name + 1 2 0xc0100000 16bdb8 kernel + 7 1 0xc24db000 d000 linux.ko + + If for some reason you do not want to or cannot load the + linux KLD, then statically link the emulator in the kernel by + adding + + +options LINUX + + to your kernel config file. Then run config and install the new + kernel as described in the kernel + configuration section. + + Installing Linux Runtime Libraries diff --git a/en_US.ISO_8859-1/books/handbook/linuxemu/chapter.sgml b/en_US.ISO_8859-1/books/handbook/linuxemu/chapter.sgml index 0a937d5c88..e2ca00371d 100644 --- a/en_US.ISO_8859-1/books/handbook/linuxemu/chapter.sgml +++ b/en_US.ISO_8859-1/books/handbook/linuxemu/chapter.sgml @@ -1,7 +1,7 @@ @@ -103,7 +103,7 @@ linux - Installing Linux Emulation in 2.2.2-RELEASE and later + Installing Linux Emulation in 2.2.2-RELEASE and later 2.2 versions It is no longer necessary to specify options LINUX or options COMPAT_LINUX. Linux @@ -132,7 +132,7 @@ fi - If you want to verify it is running, modstat will do that: + If you want to verify that the LKM is running, modstat will do that: &prompt.user; modstat Type Id Off Loadaddr Size Info Rev Module Name @@ -151,6 +151,55 @@ options LINUX configuration section. + + Installing Linux Emulation in 3.0-RELEASE and later + + It is no longer necessary to specify options + LINUX or options COMPAT_LINUX. Linux + emulation is done with an KLD object (“Kernel LoaDable object”) + so it can be installed on the fly without having to reboot. You will + need the following things in your startup files, however: + + + + In /etc/rc.conf, you need the following + line: + + +linux_enable=YES + + + + This, in turn, triggers the following action in + /etc/rc.i386: + + +# Start the Linux binary emulation if requested. +if [ "X${linux_enable}" = X"YES" ]; then echo -n ' + linux'; linux > /dev/null 2>&1 +fi + + + + If you want to verify that the KLD is loaded, kldstat will do that: + + &prompt.user; kldstat +Id Refs Address Size Name + 1 2 0xc0100000 16bdb8 kernel + 7 1 0xc24db000 d000 linux.ko + + If for some reason you do not want to or cannot load the + linux KLD, then statically link the emulator in the kernel by + adding + + +options LINUX + + to your kernel config file. Then run config and install the new + kernel as described in the kernel + configuration section. + + Installing Linux Runtime Libraries