Merge branch 'r-0.3.3' into develop

1 files changed, 68 insertions, 20 deletions

diff --git a/core/reboot.html b/core/reboot.html
index aa45a0f..ea174a2 100644
--- a/core/reboot.html
+++ b/core/reboot.html
@@ -31,30 +31,77 @@
           /bin/bash --login
         </pre>
 
-        <h2 id="linux">1.4.1. Port kernel</h2>
+        <h2 id="linux">1.4.1. Kernel</h2>
 
-        <p>Core ports have two
-        <a href="linux.html">linux kernels</a>,
-        <a href="ports/linux-libre">linux-libre</a> and
-        <a href="ports/linux-blob">linux-blob</a>.
-        Port linux-libre kernel is a true source based kernel that
-        respects your freedoms, is x86_64 but not generic configured,
-        select modules (drivers) for your hardware, for example
-        correct graphic driver and disk. Port linux-blob is dangerous,
-        contain blobs (from bad corporations).</p>
+        <p>Install <a href="ports/linux-gnu">linux-gnu</a> port,
+        linux libre kernel is a true source based kernel that
+        respects your freedoms. Read <a href="linux.html">linux kernel</a> 
+        for more information.</p>
 
-        <p>Both ports apply grsecurity patch and are configured in
-        a way that break building some packages and have performance
-        impact in building process. Solution is to have several kernels,
-        production, testing, debug with one of them without grsecurity.</p>
+	<p>Default crux configuration can be obtained from iso,
+	kernel port depend on <a href="reboot.html#dracut">dracut</a>, grub2
+	and grub2-efi. You don't need them to build with pkgmk, to install
+	boot related tools use prt-get;</p>
+
+	<pre>
+	$ prt-get depinst linux-gnu
+	</pre>
+
+        <p>If you don't have the port binary package build it;</p>
+
+        <pre>
+        # cd /usr/ports/c9-ports/linux-gnu
+        # pkgmk -d
+        </pre>
+
+        <p>Install kernel;</p>
 
         <pre>
-        # cd /usr/ports/c9-ports/linux-libre
+        # pkgadd /usr/ports/packages/linux-gnu#4.9.86-2.pkg.tar.gz
+        </pre>
+
+        <h2 id="dracut">1.4.2. Dracut</h2>
+
+        <p>Install dracut;</p>
+
+        <pre>
+        # cd /usr/ports/c9-ports/dracut
         # pkgmk -d
-        # pkgadd /usr/ports/packages/linux-libre#4.9.11-2.pkg.tar.gz
+        # pkgadd /usr/ports/packages/dracut#044-2.pkg.tar.gz
         </pre>
 
-        <h2 id="grub">1.4.3. Configuring Grub2</h2>
+        <p>Review configuration file;</p>
+
+        <pre>
+        # PUT YOUR CONFIG IN separate files
+        # in /etc/dracut.conf.d named "<name>.conf"
+
+        # Equivalent to -H
+        hostonly="no"
+
+        # Mount / and /usr read-only by default.
+        ro_mnt="no"
+
+        # Equivalent to -m "module module module"
+        dracutmodules+="dash kernel-modules rootfs-block udev-rules usrmount base fs-lib shutdown"
+
+        # Equivalent to -a "module"
+        add_dracutmodules+="caps debug"
+
+        # Equivalent to -o "module"
+        #omit_dracutmodules+="systemd systemd-bootchart systemd-networkd systemd-initrd"
+
+        # SEE man dracut.conf(5) for options
+        </pre>
+
+        <p>Run dracut to create init ram filesystem for
+        port linux-blob kernel;</p>
+
+        <pre>
+        # dracut --kver 4.9.86-gnu
+        </pre>
+
+        <h2 id="grub">1.4.3. Grub</h2>
 
         <p>Create grub file in /etc/default/grub with values;</p>
 
@@ -85,8 +132,8 @@
         <pre>
         # grub-mkconfig -o /boot/grub/grub.cfg
         Generating grub.cfg ...
-        Found linux image: /boot/vmlinuz-4.1.30-crux
-        Found initrd image: /boot/initramfs-4.1.30-crux.img
+        Found linux image: /boot/vmlinuz-4.9.86-gnu
+        Found initrd image: /boot/initramfs-4.9.86-gnu.img
         done
         #
         </pre>
@@ -127,6 +174,7 @@
             linux (loop)/boot/vmlinuz64 loglevel=3 cde
             initrd (loop)/boot/corepure64.gz
         }
+        </pre>
 
         <h2 id="checkup">1.4.4. Checkup</h2>
 
@@ -142,7 +190,7 @@
         <h3>Debug initram</h3>
 
         <pre>
-        /usr/lib/dracut/skipcpio /boot/initramfs-4.9.11-blob.img | gunzip -c | cpio -i -d
+        /usr/lib/dracut/skipcpio /boot/initramfs-4.9.86-gnu.img | gunzip -c | cpio -i -d
         36875 blocks
         </pre>