Merge branch 'master' into develop

1 files changed, 51 insertions, 25 deletions

diff --git a/core/install.html b/core/install.html
index 6ee381b..64fbe02 100644
--- a/core/install.html
+++ b/core/install.html
@@ -15,7 +15,7 @@
         ports. Process of installation documented can be
         executed from iso or from existing gnu\linux installation.
         Read
-        <a href="http://crux.nu/Main/Handbook3-5">Hand book 3.4</a>,
+        <a href="http://crux.nu/Main/Handbook3-5">Hand book 3.5</a>,
         .</p>
 
         <p>If you are booting from crux iso and is not your keyboard
@@ -37,29 +37,56 @@
         $ curl -k -O https://serverop.de/crux/crux-3.5/iso/crux-3.5.iso
         $ curl -k -O https://serverop.de/crux/crux-3.5/iso/crux-3.5.md5
         $ md5sum crux-3.5.iso
-        73bf4d301e2dcfb0636cb7fc2a9e8fde crux-3.5.iso
+        eb0c9b75322ba240f229ec9834feddfd crux-3.5.iso
         </pre>
 
         <h2 id="step2">1.1.2. Prepare target</h2>
 
         <p>Prepare disk or target location where new system will
-        be installed. Follow steps describe how to create efi system,
-        for bios_boot systems is only needed the boot partition in
-        the beginning of the disk and can use ext4 file system for example.
-        For more information about gpt partitions table read
+        be installed. Following steps describe how to create efi
+        system or msdos. Systems with bios_boot(msdos) only require
+        boot partition in the beginning of the disk, use ext4 file
+        system. For more information about gpt partitions table read
         <a href="http://devil-detail.blogspot.com/2013/07/install-grub2-on-gpt-disk-dedicated-partition.html">devil-detail grub2 on gpt</a>. Script <a href="scripts/setup-target.sh">setup-target.sh</a> help to create partitions
         scripts.</p>
 
-        </p>
+        <p>Load dm-crypt module and start parted;</p>
 
-        <p>Create gpt label and set unit size to use;</p>
+        <pre>
+        # modprobe dm-crypt
+        # parted /dev/sda
+        </pre>
+
+        <p>Set unit size to use;</p>
 
         <pre>
-        (parted) mklabel gpt
         (parted) unit mib
         </pre>
 
-        <h3>bootloader</h3>
+        <h3>bios_boot</h3>
+
+        <p>If the system don't support efi, on bios_boot systems;</p>
+
+        <pre>
+        (parted) mklabel msdos
+        </pre>
+
+        <p>Boot partition. Partition with 1G provide room for kernels
+        and bootable iso's that can be directly boot from grub (without root
+        partition). Partition size ~1G;</p>
+
+        <pre>
+        (parted) mkpart primary ext4 2 1132
+        (parted) set 1 boot on
+        </pre>
+
+        <h3>efi/esp</h3>
+
+        <p>On systems that support efi;</p>
+
+        <pre>
+        (parted) mklabel gpt
+        </pre>
 
         <p>Partition used by grub boot loader. Partition size 2M;</p>
 
@@ -69,8 +96,6 @@
         set 1 bios_grub on
         </pre>
 
-        <h3>/boot/efi</h3>
-
         <p>EFI System Partition, ESP type EF00. Partition
         with between 500M and 100M is recommended for standard
         installations. Partition size 128M;</p>
@@ -81,18 +106,16 @@
         (parted) set 2 boot on
         </pre>
 
-        <h3>/boot</h3>
-
         <p>Boot partition. Partition with 1G provide room for kernels
         and bootable iso's that can be directly boot from grub (without root
-        partition). Partition size 1G;</p>
+        partition). Partition size ~1G;</p>
 
         <pre>
         (parted) mkpart primary ext4 132 1132
         (parted) name 3 boot
         </pre>
 
-        <h3>/</h3>
+        <h3>Encrypted lvm</h3>
 
         <p>There are different ways to achieve disk encryption,
         the method described uses cryptosetup to create cryptodevice
@@ -102,15 +125,16 @@
 
         <pre>
         (parted) mkpart primary 1132 100%
-        (parted) set 4 lvm on
         </pre>
 
-        <p>Create encrypted block for lvm;</p>
+        <p>Create encrypted block for lvm, partition layout of efi and bios boot systems is different.</p>
+
+        <p>On bios_boot systems partition should be  2;</p>
 
         <pre>
-        # modprobe dm-crypt
-        # cryptsetup luksFormat /dev/sda4
-        # cryptsetup luksOpen /dev/sda4 cryptlvm
+        (parted) set 4 lvm on
+        # cryptsetup luksFormat /dev/sda2
+        # cryptsetup luksOpen /dev/sda2 cryptlvm
         </pre>
 
         <p>Create physical group and volume group;</p>
@@ -120,6 +144,8 @@
         # vgcreate vg_system /dev/mapper/cryptlvm
         </pre>
 
+        <h3>/ root partition</h3>
+
         <p>Core collection installation on root partition uses
         approximately 2G. Partition with 8G-20G is recommended
         for a server or desktop with dedicated ports partition
@@ -130,7 +156,7 @@
         # lvcreate -L 20G -n lv_root vg_system
         </pre>
 
-        <h3>/var</h3>
+        <h3>/var partition</h3>
 
         <p>Var partition is recommended 1G-5G depending on how
         system is configured. Partition size 2G;</p>
@@ -372,9 +398,9 @@
         </pre>
 
         <a href="index.html">Core OS Index</a>
-        <p>This is part of the Hive System Documentation.
-        Copyright (C) 2019
-        Hive Team.
+        <p>This is part of the Tribu System Documentation.
+        Copyright (C) 2020
+        Tribu Team.
         See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a>
         for copying conditions.</p>