getch 0.0.9 → 0.1.5

data/lib/getch/filesystem/ext4/partition.rb

@@ -5,13 +5,15 @@ module Getch
         def initialize
           super
           @state = Getch::States.new()
+          @clean = Getch::FileSystem::Clean
+          @partition = Getch::FileSystem::Partition.new
           run_partition
         end
 
         def run_partition
           return if STATES[:partition ]
-          clear_struct
-          cleaning
+          @clean.hdd(@disk)
+          @clean.external_disk(@disk, @boot_disk, @cache_disk, @home_disk)
           if Helpers::efi?
             partition_efi
           else
@@ -22,35 +24,16 @@ module Getch
 
         private
 
-        def clear_struct
-          exec("sgdisk -Z /dev/#{@disk}")
-          exec("wipefs -a /dev/#{@disk}")
-        end
-
-        def cleaning
-          puts
-          print "Cleaning data on #{@disk}, can be long, avoid this on Flash Memory (SSD,USB,...) ? (n,y) "
-          case gets.chomp
-          when /^y|^Y/
-            bloc=`blockdev --getbsz /dev/#{@disk}`.chomp
-            exec("dd if=/dev/urandom of=/dev/#{@disk} bs=#{bloc} status=progress")
-          else
-            return
-          end
-        end
-
         # Follow https://wiki.archlinux.org/index.php/Partitioning
         def partition_efi
-          # /boot/efi - EFI system partition - 260MB
-          # /         - Root
-          # swap      - Linux Swap - size of the ram
-          # /home     - Home
-          mem=`awk '/MemTotal/ {print $2}' /proc/meminfo`.chomp + 'K'
-
-          exec("sgdisk -n1:1M:+260M -t1:EF00 /dev/#{@disk}")
-          exec("sgdisk -n2:0:+15G -t2:8304 /dev/#{@disk}")
-          exec("sgdisk -n3:0:+#{mem} -t3:8200 /dev/#{@disk}")
-          exec("sgdisk -n4:0:0 -t4:8302 /dev/#{@disk}") if @dev_home
+          # /efi   - EFI system partition - 260MB
+          # swap   - Linux Swap - size of the ram
+          # /      - Root
+          # /home  - Home
+          @partition.efi(@dev_esp)
+          @partition.swap(@dev_swap)
+          @partition.root(@dev_root, "8304")
+          @partition.home(@dev_home, "8302") if @dev_home
         end
 
         def partition_bios
@@ -58,16 +41,10 @@ module Getch
           # /         - Root
           # swap      - Linux Swap - size of the ram
           # /home     - Home
-          mem=`awk '/MemTotal/ {print $2}' /proc/meminfo`.chomp + 'K'
-
-          exec("sgdisk -n1:1MiB:+1MiB -t1:EF02 /dev/#{@disk}")
-          exec("sgdisk -n2:0:+15G -t2:8304 /dev/#{@disk}")
-          exec("sgdisk -n3:0:+#{mem} -t3:8200 /dev/#{@disk}")
-          exec("sgdisk -n4:0:0 -t4:8302 /dev/#{@disk}") if @dev_home
-        end
-
-        def exec(cmd)
-          Getch::Command.new(cmd).run!
+          @partition.gpt(@dev_gpt)
+          @partition.swap(@dev_swap)
+          @partition.root(@dev_root, "8304")
+          @partition.home(@dev_home, "8302") if @dev_home
         end
       end
     end

data/lib/getch/filesystem/lvm/config.rb

@@ -16,23 +16,23 @@ module Getch
         end
 
         def systemd_boot
-          return if ! Helpers::efi? 
-          esp = '/boot/efi'
+          return if !@efi
+          esp = '/efi'
           dir = "#{@root_dir}/#{esp}/loader/entries/"
           datas_gentoo = [
             'title Gentoo Linux',
             'linux /vmlinuz',
             'initrd /initramfs',
-            "options resume=UUID=#{@uuid_swap} root=UUID=#{@uuid_root} init=#{@init} dolvm rw"
+            "options resume=#{@lv_swap} root=#{@lv_root} init=#{@init} dolvm rw"
           ]
           File.write("#{dir}/gentoo.conf", datas_gentoo.join("\n"))
         end
 
         def grub
-          return if Helpers::efi?
+          return if @efi
           file = "#{@root_dir}/etc/default/grub"
           cmdline = [ 
-            "GRUB_CMDLINE_LINUX=\"resume=UUID=#{@uuid_swap} root=UUID=#{@uuid_root} init=#{@init} dolvm rw\""
+            "GRUB_CMDLINE_LINUX=\"resume=#{@lv_swap} root=#{@lv_root} init=#{@init} dolvm rw\""
           ]
           File.write("#{file}", cmdline.join("\n"), mode: 'a')
         end
@@ -40,22 +40,18 @@ module Getch
         private
 
         def gen_uuid
-          @uuid_swap = `lsblk -o "UUID" #{@lv_swap} | tail -1`.chomp() if @lv_swap
-          @uuid_root = `lsblk -o "UUID" #{@lv_root} | tail -1`.chomp() if @lv_root
-          @uuid_dev_root = `lsblk -o "UUID" #{@dev_root} | tail -1`.chomp() if @dev_root
           @uuid_boot = `lsblk -o "UUID" #{@dev_boot} | tail -1`.chomp() if @dev_boot
-          @uuid_boot_efi = `lsblk -o "UUID" #{@dev_boot_efi} | tail -1`.chomp() if @dev_boot_efi
-          @uuid_home = `lsblk -o "UUID" #{@lv_home} | tail -1`.chomp() if @lv_home
+          @uuid_esp = `lsblk -o "UUID" #{@dev_esp} | tail -1`.chomp() if @dev_esp
         end
 
         def data_fstab
-          boot_efi = @dev_boot_efi ? "UUID=#{@uuid_boot_efi} /boot/efi vfat noauto,noatime 1 2" : ''
+          efi = @dev_esp ? "UUID=#{@uuid_esp} /efi vfat noauto,noatime 1 2" : ''
           boot = @dev_boot ? "UUID=#{@uuid_boot} /boot ext4 noauto,noatime 1 2" : ''
-          swap = @lv_swap ? "UUID=#{@uuid_swap} none swap discard 0 0" : ''
-          root = @lv_root ? "UUID=#{@uuid_root} / ext4 defaults 0 1" : ''
-          home = @lv_home ? "UUID=#{@uuid_home} /home/#{@user} ext4 defaults 0 2" : ''
+          swap = "#{@lv_swap} none swap discard 0 0"
+          root = "#{@lv_root} / ext4 defaults 0 1"
+          home = @lv_home ? "#{@lv_home} /home/#{@user} ext4 defaults 0 2" : ''
 
-          [ boot_efi, boot, swap, root, home ]
+          [ efi, boot, swap, root, home ]
         end
       end
     end

data/lib/getch/filesystem/lvm/deps.rb

@@ -2,16 +2,9 @@ module Getch
   module FileSystem
     module Lvm
       class Deps
-        def initialize
-          if Helpers::efi?
-            install_efi
-          else
-            install_bios
-          end
-          install_deps
-        end
-
         def make
+          install_bios unless Helpers::efi?
+          install_deps
           options_make
           Getch::Make.new("genkernel --kernel-config=/usr/src/linux/.config all").run!
         end
@@ -34,22 +27,14 @@ module Getch
           File.write(file, datas.join("\n"), mode: 'a')
         end
 
-        def install_efi
-        end
-
-        def install_bios
-          exec("euse -p sys-boot/grub -E device-mapper")
-        end
-
         def install_deps
-          exec("euse -E lvm")
-          Getch::Emerge.new('genkernel lvm2').pkg!
-          Getch::Garden.new('-a lvm').run!
+          Getch::Bask.new('-a lvm').run!
+          Getch::Emerge.new('sys-fs/lvm2 genkernel').pkg!
           exec("systemctl enable lvm2-monitor")
         end
 
         def exec(cmd)
-          Helpers::run_chroot(cmd, MOUNTPOINT)
+          Getch::Chroot.new(cmd).run!
         end
       end
     end

data/lib/getch/filesystem/lvm/device.rb

@@ -1,17 +1,41 @@
 module Getch
   module FileSystem
     module Lvm
-      class Device
+      class Device < Getch::FileSystem::Device
         def initialize
-          @disk = DEFAULT_OPTIONS[:disk]
-          @user = DEFAULT_OPTIONS[:username]
-          @dev_boot_efi = Helpers::efi? ? "/dev/#{@disk}1" : nil
-          @dev_boot = Helpers::efi? ? nil : "/dev/#{@disk}2"
-          @dev_root = Helpers::efi? ? "/dev/#{@disk}2" : "/dev/#{@disk}3"
+          super
           @vg = 'vg0'
-          @lv_root = "/dev/mapper/#{@vg}-root"
-          @lv_swap = "/dev/mapper/#{@vg}-swap"
-          @lv_home = @user ? "/dev/mapper/#{@vg}-home" : nil
+          @lv_root = "/dev/#{@vg}/root"
+          @lv_swap = "/dev/#{@vg}/swap"
+          @lv_home = @home_disk ? "/dev/#{@vg}/home" : nil
+        end
+
+        private
+
+        def search_boot
+          if @efi
+            if @boot_disk
+              @dev_esp = "/dev/#{@boot_disk}1"
+            else
+              @dev_esp = "/dev/#{@disk}1"
+              @root_part += 1
+            end
+          else
+            if @boot_disk
+              @dev_gpt = "/dev/#{@boot_disk}1"
+              @dev_boot = "/dev/#{@boot_disk}2"
+              @dev_grub = "/dev/#{@boot_disk}"
+            else
+              @dev_gpt = "/dev/#{@disk}1"
+              @dev_boot = "/dev/#{@disk}2"
+              @dev_grub = "/dev/#{@disk}"
+              @root_part += 2
+            end
+          end
+        end
+        
+        # The swap is a part of the LVM volume, so we clean the func
+        def search_swap
         end
       end
     end

data/lib/getch/filesystem/lvm/encrypt/config.rb

@@ -19,20 +19,20 @@ module Getch
 
           def systemd_boot
             return if ! Helpers::efi? 
-            esp = '/boot/efi'
+            esp = '/efi'
             dir = "#{@root_dir}/#{esp}/loader/entries/"
             datas_gentoo = [
               'title Gentoo Linux',
               'linux /vmlinuz',
               'initrd /initramfs',
-              "options crypt_root=UUID=#{@uuid_dev_root} root=#{@lv_root} init=#{@init} keymap=#{DEFAULT_OPTIONS[:keymap]} dolvm rw"
+              "options crypt_root=UUID=#{@uuid_dev_root} root=/dev/mapper/root real_root=#{@lv_root} init=#{@init} keymap=#{DEFAULT_OPTIONS[:keymap]} dolvm rw"
             ]
             File.write("#{dir}/gentoo.conf", datas_gentoo.join("\n"))
           end
 
           def crypttab
             datas = [
-              "cryptswap #{@lv_swap} /dev/urandom swap,cipher=aes-xts-plain64:sha256,size=256"
+              "cryptswap #{@lv_swap} /dev/urandom swap,cipher=aes-xts-plain64:sha256,size=512"
             ]
             File.write("#{@root_dir}/etc/crypttab", datas.join("\n"))
           end
@@ -41,7 +41,7 @@ module Getch
             return if Helpers::efi?
             file = "#{@root_dir}/etc/default/grub"
             cmdline = [ 
-              "GRUB_CMDLINE_LINUX=\"crypt_root=UUID=#{@uuid_dev_root} root=#{@lv_root} init=#{@init} dolvm rw slub_debug=P page_poison=1 slab_nomerge pti=on vsyscall=none spectre_v2=on spec_store_bypass_disable=seccomp iommu=force keymap=#{DEFAULT_OPTIONS[:keymap]}\"",
+              "GRUB_CMDLINE_LINUX=\"crypt_root=UUID=#{@uuid_dev_root} root=/dev/mapper/root real_root=#{@lv_root} init=#{@init} dolvm rw slub_debug=P page_poison=1 slab_nomerge pti=on vsyscall=none spectre_v2=on spec_store_bypass_disable=seccomp iommu=force keymap=#{DEFAULT_OPTIONS[:keymap]}\"",
               "GRUB_ENABLE_CRYPTODISK=y"
             ]
             File.write("#{file}", cmdline.join("\n"), mode: 'a')
@@ -50,20 +50,17 @@ module Getch
           private
 
           def gen_uuid
-            @uuid_swap = `lsblk -o "UUID" #{@lv_swap} | tail -1`.chomp() if @lv_swap
-            @uuid_root = `lsblk -d -o "UUID" #{@lv_root} | tail -1`.chomp() if @lv_root
             @uuid_dev_root = `lsblk -d -o "UUID" #{@dev_root} | tail -1`.chomp() if @dev_root
             @uuid_boot = `lsblk -o "UUID" #{@dev_boot} | tail -1`.chomp() if @dev_boot
-            @uuid_boot_efi = `lsblk -o "UUID" #{@dev_boot_efi} | tail -1`.chomp() if @dev_boot_efi
-            @uuid_home = `lsblk -o "UUID" #{@lv_home} | tail -1`.chomp() if @lv_home
+            @uuid_esp = `lsblk -o "UUID" #{@dev_esp} | tail -1`.chomp() if @dev_esp
           end
 
           def data_fstab
-            boot_efi = @dev_boot_efi ? "UUID=#{@uuid_boot_efi} /boot/efi vfat noauto,noatime 1 2" : ''
+            boot_efi = @dev_esp ? "UUID=#{@uuid_esp} /efi vfat noauto,noatime 1 2" : ''
             boot = @dev_boot ? "UUID=#{@uuid_boot} /boot ext4 noauto,noatime 1 2" : ''
-            swap = @lv_swap ? "/dev/mapper/cryptswap none swap discard 0 0" : ''
-            root = @lv_root ? "UUID=#{@uuid_root} / ext4 defaults 0 1" : ''
-            home = @lv_home ? "UUID=#{@uuid_home} /home/#{@user} ext4 defaults 0 2" : ''
+            swap = "/dev/mapper/cryptswap none swap discard 0 0"
+            root = "#{@lv_root} / ext4 defaults 0 1"
+            home = @lv_home ? "#{@lv_home} /home/#{@user} ext4 defaults 0 2" : ''
 
             [ boot_efi, boot, swap, root, home ]
           end

data/lib/getch/filesystem/lvm/encrypt/deps.rb

@@ -3,16 +3,8 @@ module Getch
     module Lvm
       module Encrypt
         class Deps
-          def initialize
-            if Helpers::efi?
-              install_efi
-            else
-              install_bios
-            end
-            install_deps
-          end
-
           def make
+            install_deps
             options_make
             Getch::Make.new("genkernel --kernel-config=/usr/src/linux/.config all").run!
           end
@@ -37,24 +29,15 @@ module Getch
             File.write(file, datas.join("\n"), mode: 'a')
           end
 
-          def install_efi
-          end
-
-          def install_bios
-            exec("euse -p sys-boot/grub -E device-mapper")
-          end
-
           def install_deps
-            make_conf = "#{MOUNTPOINT}/etc/portage/make.conf"
-            exec("euse -E lvm") if ! Helpers::grep?(make_conf, /lvm/)
-            exec("euse -E cryptsetup") if ! Helpers::grep?(make_conf, /cryptsetup/)
-            Getch::Emerge.new('genkernel systemd sys-fs/cryptsetup lvm2').pkg!
-            Getch::Garden.new('-a lvm').run!
+            # lvm2, cryptsetup alrealy installed
+            Getch::Bask.new('-a lvm').run!
+            Getch::Emerge.new('genkernel').pkg!
             exec("systemctl enable lvm2-monitor")
           end
 
           def exec(cmd)
-            Helpers::run_chroot(cmd, MOUNTPOINT)
+            Getch::Chroot.new(cmd).run!
           end
         end
       end

data/lib/getch/filesystem/lvm/encrypt/device.rb

@@ -2,18 +2,42 @@ module Getch
   module FileSystem
     module Lvm
       module Encrypt
-        class Device
+        class Device < Getch::FileSystem::Device
           def initialize
-            @disk = DEFAULT_OPTIONS[:disk]
-            @user = DEFAULT_OPTIONS[:username]
-            @dev_boot_efi = Helpers::efi? ? "/dev/#{@disk}1" : nil
-            @dev_boot = Helpers::efi? ? nil : "/dev/#{@disk}2"
-            @dev_root = Helpers::efi? ? "/dev/#{@disk}2" : "/dev/#{@disk}3"
+            super
             @vg = 'vg0'
-            @lv_root = "/dev/mapper/#{@vg}-root"
-            @lv_swap = "/dev/mapper/#{@vg}-swap"
-            @lv_home = @user ? "/dev/mapper/#{@vg}-home" : nil
+            @lv_root = "/dev/#{@vg}/root"
+            @lv_swap = "/dev/#{@vg}/swap"
+            @lv_home = @home_disk ? "/dev/#{@vg}/home" : nil
             @luks_root = "/dev/mapper/cryptroot"
+            @luks_home = @home_disk ? "/dev/mapper/crypthome" : nil
+          end
+
+          private
+
+          def search_boot
+            if @efi
+              if @boot_disk
+                @dev_esp = "/dev/#{@boot_disk}1"
+              else
+                @dev_esp = "/dev/#{@disk}1"
+                @root_part += 1
+              end
+            else
+              if @boot_disk
+                @dev_gpt = "/dev/#{@boot_disk}1"
+                @dev_boot = "/dev/#{@boot_disk}2"
+                @dev_grub = "/dev/#{@boot_disk}"
+              else
+                @dev_gpt = "/dev/#{@disk}1"
+                @dev_boot = "/dev/#{@disk}2"
+                @dev_grub = "/dev/#{@disk}"
+                @root_part += 2
+              end
+            end
+          end
+
+          def search_swap
           end
         end
       end

data/lib/getch/filesystem/lvm/encrypt/format.rb

@@ -12,10 +12,10 @@ module Getch
 
           def format
             return if STATES[:format]
-            puts "Format #{@disk} with #{@fs}"
-            exec("mkfs.fat -F32 #{@dev_boot_efi}") if @dev_boot_efi
+            puts "Format #{@disk}"
+            exec("mkfs.fat -F32 #{@dev_esp}") if @dev_esp
             exec("mkfs.#{@fs} -F #{@dev_boot}") if @dev_boot
-            #exec("mkswap -f #{@lv_swap}")
+            exec("mkswap -f #{@lv_swap}")
             exec("mkfs.#{@fs} -F #{@lv_root}")
             exec("mkfs.#{@fs} -F #{@lv_home}") if @lv_home
             @state.format

data/lib/getch/filesystem/lvm/encrypt/mount.rb

@@ -1,5 +1,3 @@
-require 'fileutils'
-
 module Getch
   module FileSystem
     module Lvm
@@ -7,54 +5,17 @@ module Getch
         class Mount < Getch::FileSystem::Lvm::Encrypt::Device
           def initialize
             super
-            @root_dir = MOUNTPOINT
-            @boot_dir = "#{@root_dir}/boot"
-            @boot_efi_dir = "#{@root_dir}/boot/efi"
-            @home_dir = @user ? "#{@root_dir}/home/#{@user}" : nil
-            @state = Getch::States.new()
+            @mount = Getch::FileSystem::Mount.new
+            @state = Getch::States.new
           end
 
           def run
             return if STATES[:mount]
-            mount_swap
-            mount_root
-            mount_boot
-            mount_home
-            mount_boot_efi
-            @state.mount
-          end
-
-          private
-
-          def mount_swap
-            return if ! @lv_swap
-            system("swapon #{@lv_swap}")
-          end
-
-          def mount_root
-            return if ! @lv_root
-            Dir.mkdir(@root_dir, 0700) if ! Dir.exist?(@root_dir)
-            system("mount #{@lv_root} #{@root_dir}")
-          end
-
-          def mount_boot_efi
-            return if ! @dev_boot_efi
-            FileUtils.mkdir_p @boot_efi_dir, mode: 0700 if ! Dir.exist?(@boot_efi_dir)
-            system("mount #{@dev_boot_efi} #{@boot_efi_dir}")
-          end
-
-          def mount_boot
-            return if ! @dev_boot
-            FileUtils.mkdir_p @boot_dir, mode: 0700 if ! Dir.exist?(@boot_dir)
-            system("mount #{@dev_boot} #{@boot_dir}")
-          end
-
-          def mount_home
-            return if ! @lv_home
-            if @user != nil then
-              FileUtils.mkdir_p @home_dir, mode: 0700 if ! Dir.exist?(@home_dir)
-              system("mount #{@lv_home} #{@home_dir}")
-            end
+            @mount.swap(@lv_swap)
+            @mount.root(@lv_root)
+            @mount.boot(@dev_boot)
+            @mount.esp(@dev_esp)
+            @mount.home(@lv_home)
             @state.mount
           end
         end