getch 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb6075f7c63fb0a9b3d9cae63e24aae84cb3c90947985aa54ba48bc0dd284dcc
-  data.tar.gz: 26ad192fed5685f42e62d400706d6127c3d28a0fc5ce67296da6ef758955de25
+  metadata.gz: 4d697434a5e8a44edb8027582ece052145c440247524597afe5ad28118115154
+  data.tar.gz: 42eb9e224e6581752f28d6997a9e10feb0e65c432e0dd80bc87236d7e597d828
 SHA512:
-  metadata.gz: fe321ca0175f95f07c68026269830932609ba2fe5a1757efb7228bc26a069c4f5c322b21c534d05077c98a4dddfb0ed33bb2aa2fb30b1bc2df234e25b47acb56
-  data.tar.gz: 5b3540c9a1f07162bfbb3e4772f78c0b74b9525ec74fed7ce71c507da5f58befc85e6f8198abc595b49fa767abc77349f56b0ab9790d56730c45771365268fb0
+  metadata.gz: 2e17128164b81b58d59f296e360197a2b9fbb33fd2b1cbd58128b1b04885eef4480d067c5588d40802c889e5a80861b63c37454b685bdb6263e9806b2e99b208
+  data.tar.gz: f8eee6f6b37fb036a05003d109672615cc7439dcc5277f2d4604d58e66b2407fa648bdccb850269545f2aef5441777a0d936842326cecb7410b05dfb6dbcee64

data/CHANGELOG.md

@@ -1,7 +1,12 @@
-* Repair GRUB/fstab for BIOS system, add config and all
-* New option --encrypt (LVM/EXT4/LUKS for now)
-* Adding LVM
-* Create a swap volume equal to the memory installed
+* Adding LVM via the option fs, `--fs lvm`.
+* Systemd-boot use the value of PARTUUID without initramfs.
+* Include lib logger.
+
+## 0.0.7, release 2020-09-22
+* Correct fstab.
+* Repair GRUB/fstab for BIOS system, add secure cmdline.
+* Create a swap volume equal to the memory installed.
+* Add vim and sudo
 
 ## 0.0.6, release 2020-09-19
 * Add support for QEMU guest with KVM and Virtio driver

data/README.md

@@ -23,7 +23,7 @@ With `gem` installed:
 
 When you boot from an `iso`, you can install `ruby`, `getch` and correct your `PATH=` directly with the `bin/setup.sh`:
 
-    # curl https://raw.githubusercontent.com/szorfein/getch/master/bin/setup.sh | sh
+    # sh <(curl -L https://raw.githubusercontent.com/szorfein/getch/master/bin/setup.sh)
     # source ~/.zshrc # or ~/.bashrc
 
 ## Usage
@@ -37,6 +37,10 @@ For a french user:
 
 After an install by Getch, take a look on the [wiki](https://github.com/szorfein/getch/wiki).
 
+Install Gentoo on LVM:
+
+    # getch --format lvm --disk sda
+
 ## Issues
 If need more support for your hardware (network, sound card, ...), you can submit a [new issue](https://github.com/szorfein/getch/issues/new) and post the output of the following command:
 + lspci

data/bin/setup.sh

@@ -26,7 +26,7 @@ search_ruby() {
   else
     echo "Install ruby"
     if hash pacman 2>/dev/null ; then
-      pacman -Syy libyaml ruby ruby-irb ruby-reline rubygems
+      pacman -Syy --noconfirm libyaml ruby ruby-irb ruby-reline rubygems
     elif hash emerge 2>/dev/null ; then
       emerge -av dev-lang/ruby
     elif hash apt-get 2>/dev/null ; then

data/lib/getch.rb

@@ -4,6 +4,7 @@ require_relative 'getch/gentoo'
 require_relative 'getch/filesystem'
 require_relative 'getch/command'
 require_relative 'getch/helpers'
+require_relative 'getch/log'
 
 module Getch
 
@@ -30,7 +31,8 @@ module Getch
 
   MOUNTPOINT = "/mnt/gentoo".freeze
   OPTIONS_FS = {
-    'ext4' => DEFAULT_OPTIONS[:encrypt] ? Getch::FileSystem::Ext4::Encrypt : Getch::FileSystem::Ext4
+    'ext4' => DEFAULT_OPTIONS[:encrypt] ? Getch::FileSystem::Ext4::Encrypt : Getch::FileSystem::Ext4,
+    'lvm' => DEFAULT_OPTIONS[:encrypt] ? Getch::FileSystem::Lvm::Encrypt : Getch::FileSystem::Lvm
   }.freeze
 
   def self.resume_options(opts)
@@ -54,10 +56,12 @@ module Getch
 
   def self.format(disk, fs, user)
     return if STATES[:format] and STATES[:partition]
+    log = Log.new
     puts
     print "Partition and format disk #{disk}, this will erase all data, continue? (n,y) "
     case gets.chomp
     when /^y|^Y/
+      log.info("Partition start")
       OPTIONS_FS[fs]::Partition.new
       OPTIONS_FS[fs]::Format.new
     else

data/lib/getch/command.rb

@@ -4,14 +4,22 @@ module Getch
   class Command
     def initialize(cmd)
       @cmd = cmd
-      @block_size = 512
+      @block_size = 1024
+      @log = Getch::Log.new
     end
 
     def run!
-      puts "Running command: " + @cmd.gsub(/\"/, '')
+      @log.info "Running command: " + @cmd.gsub(/\"/, '')
 
-      Open3.popen3(@cmd) do |stdin, stdout, stderr|
+      Open3.popen3(@cmd) do |stdin, stdout, stderr, wait_thr|
         stdin.close_write
+        code = wait_thr.value
+
+        # only stderr
+        begin
+          @log.error stderr.readline until stderr.eof.nil?
+        rescue EOFError
+        end
 
         begin
           files = [stdout, stderr]
@@ -24,25 +32,20 @@ module Getch
               # writable = ready[1]
               # exceptions = ready[2]
 
-              readable.each do |f|
-                fileno = f.fileno
-
-                begin
-                  data = f.read_nonblock(@block_size)
-
-                  # Do something with the data...
-                  puts "#{data}" if DEFAULT_OPTIONS[:verbose]
-                rescue EOFError
-                  puts "fileno: #{fileno} EOF"
-                end
-              end
+              display_lines(readable)
             end
           end
         rescue IOError => e
           puts "IOError: #{e}"
         end
+
+        unless code.success?
+          @log.fatal "Running #{@cmd}"
+          exit 1
+        end
+
+        @log.debug "Done - #{@cmd} - #{code}"
       end
-      puts "Done"
     end
 
     private
@@ -51,5 +54,103 @@ module Getch
     def all_eof(files)
       files.find { |f| !f.eof }.nil?
     end
+
+    def display_lines(block)
+      block.each do |f|
+        begin
+          data = f.read_nonblock(@block_size)
+          puts data if DEFAULT_OPTIONS[:verbose]
+        rescue EOFError
+          puts ""
+        rescue => e
+          puts "Fatal - #{e}"
+        end
+      end
+    end
+  end
+
+  # Use system, the only ruby method to display stdout with colors !
+  class Emerge
+    def initialize(cmd)
+      @gentoo = MOUNTPOINT
+      @cmd = cmd
+      @log = Getch::Log.new
+    end
+
+    def run!
+      @log.info "Running emerge: #{@cmd}"
+      system("chroot", @gentoo, "/bin/bash", "-c", "source /etc/profile && #{@cmd}")
+      read_exit
+    end
+
+    def pkg!
+      @log.info "Running emerge pkg: #{@cmd}"
+      system("chroot", @gentoo, "/bin/bash", "-c", "source /etc/profile && emerge --changed-use #{@cmd}")
+      read_exit
+    end
+
+    private
+
+    def read_exit
+      if $?.exitstatus > 0
+        @log.fatal "Running #{@cmd}"
+      else
+        @log.info "Done #{@cmd}"
+      end
+    end
+  end
+
+  class Make
+    def initialize(cmd)
+      @gentoo = MOUNTPOINT
+      @cmd = cmd
+      @log = Getch::Log.new
+    end
+
+    def run!
+      @log.info "Running Make: #{@cmd}"
+      cmd = "chroot #{@gentoo} /bin/bash -c \"source /etc/profile \
+        && env-update \
+        && cd /usr/src/linux \
+        && #{@cmd}\""
+      Open3.popen2e(cmd) do |stdin, stdout_err, wait_thr|
+        while line = stdout_err.gets
+          puts line
+        end
+
+        exit_status = wait_thr.value
+        unless exit_status.success?
+          @log.fatal "Running #{cmd}"
+          exit 1
+        end
+      end
+    end
+  end
+
+  class Garden
+    def initialize(cmd)
+      @gentoo = MOUNTPOINT
+      @cmd = cmd
+      @log = Getch::Log.new
+    end
+
+    def run!
+      @log.info "Running Garden: #{@cmd}"
+      cmd = "chroot #{@gentoo} /bin/bash -c \"source /etc/profile \
+        && env-update \
+        && cd /root/garden-master \
+        && ./kernel.sh #{@cmd} -k /usr/src/linux\""
+      Open3.popen2e(cmd) do |stdin, stdout_err, wait_thr|
+        while line = stdout_err.gets
+          puts line
+        end
+
+        exit_status = wait_thr.value
+        unless exit_status.success?
+          @log.fatal "Running #{cmd}"
+          exit 1
+        end
+      end
+    end
   end
 end

data/lib/getch/filesystem.rb

@@ -4,3 +4,4 @@ module Getch
 end
 
 require_relative 'filesystem/ext4'
+require_relative 'filesystem/lvm'

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

@@ -22,7 +22,7 @@ module Getch
           datas_gentoo = [
             'title Gentoo Linux',
             'linux /vmlinuz',
-            "options root=UUID=#{uuid_root} init=#{@init} rw"
+            "options root=PARTUUID=#{@partuuid_root} init=#{@init} rw"
           ]
           File.write("#{dir}/gentoo.conf", datas_gentoo.join("\n"))
         end
@@ -37,6 +37,7 @@ module Getch
         private
 
         def gen_uuid
+          @partuuid_root = `lsblk -o "PARTUUID" #{@dev_root} | tail -1`.chomp() if @dev_root
           @uuid_swap = `lsblk -o "UUID" #{@dev_swap} | tail -1`.chomp() if @dev_swap
           @uuid_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

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

@@ -22,7 +22,7 @@ module Getch
 
           def install_deps
             exec("euse -p sys-apps/systemd -E cryptsetup")
-            Helpers::emerge('genkernel cryptsetup lvm2')
+            Getch::Emerge.new('genkernel cryptsetup lvm2').pkg!
             exec("genkernel --install --luks --keymap #{DEFAULT_OPTIONS[:keyboard]} --lvm --kernel-config=/usr/src/linux/.config initramfs")
             exec("systemctl enable lvm2-monitor")
           end

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

@@ -12,12 +12,18 @@ module Getch
         def format
           return if STATES[:format]
           puts "Format #{@disk} with #{@fs}"
-          system("mkfs.fat -F32 #{@dev_boot_efi}") if Helpers::efi?
-          system("mkswap -f #{@dev_swap}")
-          system("mkfs.#{@fs} #{@dev_root}")
-          system("mkfs.#{@fs} #{@dev_home}") if @dev_home
+          exec("mkfs.fat -F32 #{@dev_boot_efi}") if Helpers::efi?
+          exec("mkswap -f #{@dev_swap}")
+          exec("mkfs.#{@fs} -F #{@dev_root}")
+          exec("mkfs.#{@fs} -F #{@dev_home}") if @dev_home
           @state.format
         end
+
+        private
+
+        def exec(cmd)
+          Getch::Command.new(cmd).run!
+        end
       end
     end
   end

data/lib/getch/filesystem/lvm.rb

@@ -0,0 +1,13 @@
+module Getch
+  module FileSystem
+    module Lvm
+    end
+  end
+end
+
+require_relative 'lvm/device'
+require_relative 'lvm/partition'
+require_relative 'lvm/format'
+require_relative 'lvm/mount'
+require_relative 'lvm/config'
+require_relative 'lvm/deps'

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

@@ -0,0 +1,62 @@
+module Getch
+  module FileSystem
+    module Lvm
+      class Config < Getch::FileSystem::Lvm::Device
+        def initialize
+          super
+          gen_uuid
+          @root_dir = MOUNTPOINT
+          @init = '/usr/lib/systemd/systemd'
+        end
+
+        def fstab
+          file = "#{@root_dir}/etc/fstab"
+          datas = data_fstab
+          File.write(file, datas.join("\n"))
+        end
+
+        def systemd_boot
+          return if ! Helpers::efi? 
+          esp = '/boot/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"
+          ]
+          File.write("#{dir}/gentoo.conf", datas_gentoo.join("\n"))
+        end
+
+        def grub
+          return if Helpers::efi?
+          file = "#{@root_dir}/etc/default/grub"
+          cmdline = [ 
+            "GRUB_CMDLINE_LINUX=\"resume=UUID=#{@uuid_swap} root=UUID=#{@uuid_root} init=#{@init} dolvm rw\""
+          ]
+          File.write("#{file}", cmdline.join("\n"), mode: 'a')
+        end
+
+        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
+        end
+
+        def data_fstab
+          boot_efi = @dev_boot_efi ? "UUID=#{@uuid_boot_efi} /boot/efi vfat 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" : ''
+
+          [ boot_efi, swap, root, home ]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,57 @@
+module Getch
+  module FileSystem
+    module Lvm
+      class Deps
+        def initialize
+          if Helpers::efi?
+            install_efi
+          else
+            install_bios
+          end
+          install_deps
+        end
+
+        def make
+          options_make
+          Getch::Make.new("genkernel --kernel-config=/usr/src/linux/.config all").run!
+        end
+
+        private
+        def options_make
+          grub = Helpers::efi? ? 'BOOTLOADER="no"' : 'BOOTLOADER="grub2"'
+          datas = [
+            '',
+            grub,
+            'INSTALL="yes"',
+            'MENUCONFIG="no"',
+            'CLEAN="yes"',
+            'SAVE_CONFIG="yes"',
+            'MOUNTBOOT="yes"',
+            'MRPROPER="no"',
+            'LVM="yes"',
+          ]
+          file = "#{MOUNTPOINT}/etc/genkernel.conf"
+          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!
+          exec("systemctl enable lvm2-monitor")
+        end
+
+        def exec(cmd)
+          Helpers::run_chroot(cmd, MOUNTPOINT)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module Getch
+  module FileSystem
+    module Lvm
+      class 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"
+          @vg = 'vg0'
+          @lv_root = "/dev/mapper/#{@vg}-root"
+          @lv_swap = "/dev/mapper/#{@vg}-swap"
+          @lv_home = @user ? "/dev/mapper/#{@vg}-home" : nil
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+module Getch
+  module FileSystem
+    module Lvm
+      class Format < Getch::FileSystem::Lvm::Device
+        def initialize
+          super
+          @fs = 'ext4'
+          @state = Getch::States.new()
+          format
+        end
+
+        def format
+          return if STATES[:format]
+          puts "Format #{@disk} with #{@fs}"
+          system("mkfs.fat -F32 #{@dev_boot_efi}") if @dev_boot_efi
+          system("mkfs.#{@fs} -F #{@dev_boot}") if @dev_boot
+          system("mkswap -f #{@lv_swap}")
+          system("mkfs.#{@fs} -F #{@lv_root}")
+          system("mkfs.#{@fs} -F #{@lv_home}") if @lv_home
+          @state.format
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,62 @@
+require 'fileutils'
+
+module Getch
+  module FileSystem
+    module Lvm
+      class Mount < Getch::FileSystem::Lvm::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()
+        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
+          @state.mount
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,81 @@
+module Getch
+  module FileSystem
+    module Lvm
+      class Partition < Getch::FileSystem::Lvm::Device
+        def initialize
+          super
+          @state = Getch::States.new()
+          run_partition
+        end
+
+        def run_partition
+          return if STATES[:partition ]
+          clear_struct
+          cleaning
+          partition
+          lvm
+          @state.partition
+        end
+
+        private
+
+        def clear_struct
+          oldvg = `vgdisplay | grep #{@vg}`.chomp
+          exec("vgremove -f #{@vg}") if oldvg != '' # remove older volume group
+          exec("pvremove -f #{@dev_root}") if oldvg != '' and File.exist? @dev_root # remove older volume group
+
+          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
+
+        def partition
+          if Helpers::efi?
+            exec("sgdisk -n1:1M:+260M -t1:EF00 /dev/#{@disk}")
+            exec("sgdisk -n2:0:+0 -t2:8e00 /dev/#{@disk}")
+          else
+            exec("sgdisk -n1:1MiB:+1MiB -t1:EF02 /dev/#{@disk}")
+            exec("sgdisk -n2:0:+128MiB -t2:8300 /dev/#{@disk}")
+            exec("sgdisk -n3:0:+0 -t3:8e00 /dev/#{@disk}")
+          end
+        end
+
+        def lvm
+          mem=`awk '/MemTotal/ {print $2}' /proc/meminfo`.chomp + 'K'
+          exec("pvcreate -f #{@dev_root}")
+          exec("vgcreate -f #{@vg} #{@dev_root}")
+          # Wipe old signature: https://github.com/chef-cookbooks/lvm/issues/45
+          exec("lvcreate -y -Wy -Zy -L 15G -n root #{@vg}")
+          exec("lvcreate -y -Wy -Zy -L #{mem} -n swap #{@vg}")
+          exec("lvcreate -y -Wy -Zy -l 100%FREE -n home #{@vg}") if @user
+          exec("vgchange --available y")
+        end
+
+        # Follow https://wiki.archlinux.org/index.php/Partitioning
+        # Partition_efi
+        # /boot/efi - EFI system partition - 260MB
+        # /         - Root
+
+        # Partition_bios
+        # None      - Bios Boot Partition - 1MiB
+        # /boot     - Boot - 8300
+        # /         - Root
+
+        def exec(cmd)
+          Getch::Command.new(cmd).run!
+        end
+      end
+    end
+  end
+end

data/lib/getch/gentoo.rb

@@ -39,8 +39,8 @@ module Getch
       def chroot
         chroot = Getch::Gentoo::Chroot.new()
         chroot.update
-        chroot.world
         chroot.systemd
+        chroot.world
         return if STATES[:gentoo_kernel]
         chroot.kernel
         chroot.kernel_deps

data/lib/getch/gentoo/boot.rb

@@ -11,7 +11,6 @@ module Getch
 
       def start
         @config.fstab
-        OPTIONS_FS[DEFAULT_OPTIONS[:fs]]::Deps.new()
         bootloader
         password
         umount
@@ -41,18 +40,22 @@ module Getch
         File.write("#{MOUNTPOINT}/#{esp}/loader/loader.conf", datas_loader.join("\n"))
 
         FileUtils.cp("#{MOUNTPOINT}/usr/src/linux/arch/x86/boot/bzImage", "#{MOUNTPOINT}/#{esp}/vmlinuz", preserve: true)
+
+        initramfs = Dir.glob("#{MOUNTPOINT}/boot/initramfs-*.img")
+        FileUtils.cp("#{initramfs[0]}", "#{MOUNTPOINT}/#{esp}/initramfs", preserve: true) if initramfs != []
+
         exec_chroot("bootctl --path #{esp} update")
       end
 
       def bootctl_dep
         puts 'Installing systemd-boot...'
         exec_chroot("euse -p sys-apps/systemd -E gnuefi")
-        Helpers::emerge("sys-apps/systemd efivar", MOUNTPOINT)
+        Getch::Emerge.new("sys-apps/systemd efivar").pkg!
       end
 
       def grub
         puts 'Installing GRUB...'
-        Helpers::emerge("sys-boot/grub:2", MOUNTPOINT)
+        Getch::Emerge.new("sys-boot/grub:2").pkg!
         @config.grub
         exec_chroot("grub-install /dev/#{@disk}")
         exec_chroot('grub-mkconfig -o /boot/grub/grub.cfg')

data/lib/getch/gentoo/chroot.rb

@@ -10,15 +10,15 @@ module Getch
       def update
         return if STATES[:gentoo_update]
         puts "Downloading the last ebuilds for Gentoo..."
+        Helpers::create_dir("#{MOUNTPOINT}/var/db/repos/gentoo")
         cmd = "emerge-webrsync"
         exec_chroot(cmd)
       end
 
       def world
         return if STATES[:gentoo_update]
-        puts "Update Gentoo"
-        cmd = "emerge --update --deep --newuse @world"
-        exec_chroot(cmd)
+        puts "Update Gentoo world"
+        Getch::Emerge.new("emerge --update --deep --newuse @world").run!
         @state.update
       end
 
@@ -30,7 +30,6 @@ module Getch
 
       def kernel
         return if Dir.exist? "#{MOUNTPOINT}/usr/src/linux"
-        puts "Installing kernel gentoo-sources..."
         license = "#{MOUNTPOINT}/etc/portage/package.license"
         File.write(license, "sys-kernel/linux-firmware linux-fw-redistributable no-source-code\n")
         @pkgs << "sys-kernel/gentoo-sources"
@@ -46,7 +45,9 @@ module Getch
       def install_pkgs
         @pkgs << "app-admin/sudo"
         @pkgs << "app-editors/vim"
-        Helpers::emerge(@pkgs.join(" "), MOUNTPOINT)
+        all_pkgs = @pkgs.join(" ")
+        puts "Installing #{all_pkgs}..."
+        Getch::Emerge.new(all_pkgs).pkg!
       end
 
       private
@@ -62,7 +63,7 @@ module Getch
       end
 
       def garden_dep
-        Helpers::emerge("gentoolkit", MOUNTPOINT)
+        Getch::Emerge.new("gentoolkit").pkg!
         exec_chroot("euse -p sys-apps/kmod -E lzma")
         @pkgs << "sys-apps/kmod"
       end

data/lib/getch/gentoo/config.rb

@@ -12,10 +12,12 @@ module Getch
       def portage
         nproc = `nproc`.chomp()
         grub_pc = Helpers::efi? ? '' : 'GRUB_PLATFORMS="pc"'
+        quiet = DEFAULT_OPTIONS[:verbose] ? '' : "EMERGE_DEFAULT_OPTS=\"--jobs=#{nproc} --load-average=#{nproc}\""
         data = [
           '',
-          'ACCEPT_KEYWORD="amd64 ~amd64"',
+          'ACCEPT_KEYWORDS="amd64"',
           "MAKEOPTS=\"-j#{nproc} -l#{nproc}\"",
+          quiet,
           'INPUT_DEVICES="libinput"',
           grub_pc
         ]

data/lib/getch/gentoo/sources.rb

@@ -3,79 +3,87 @@ module Getch
     class Sources
       def initialize
         @lsmod = `lsmod`.chomp
-        @linux = '/usr/src/linux'
+        @filesystem = OPTIONS_FS[DEFAULT_OPTIONS[:fs]]::Deps.new()
       end
 
       def build_others
-        install_wifi if ismatch?('iwlwifi')
         install_zfs if ismatch?('zfs')
         virtualbox_guest
         qemu_guest
+        install_wifi
+        install_audio
       end
 
       def build_kspp
         puts "Adding KSPP to the kernel source"
-        exec("./kernel.sh -b -a systemd -k #{@linux}")
+        garden("-b -a systemd")
       end
 
       def make
-        puts "Compiling kernel sources"
-        cmd = "cd #{@linux} && make -j$(nproc) && make modules_install && make install"
-        exec_chroot(cmd)
-        is_kernel = Dir.glob("#{MOUNTPOINT}/boot/vmlinuz-*")
-        raise "No kernel installed, compiling source fail..." if is_kernel == []
-      end
-
-      def only_make
-        exec_chroot("cd #{@linux} && make -j$(nproc)")
+        if DEFAULT_OPTIONS[:fs] == 'lvm'
+          @filesystem.make
+        else
+          just_make
+        end
       end
 
       def init_config
-        exec_chroot("env-update && cd #{@linux} && make localyesconfig")
+        Getch::Make.new("make localyesconfig").run!
       end
 
       private
 
+      def only_make
+        Getch::Make.new("make -j$(nproc)").run!
+      end
+
+      def just_make
+        puts "Compiling kernel sources"
+        cmd = "make -j$(nproc) && make modules_install && make install"
+        Getch::Make.new(cmd).run!
+        is_kernel = Dir.glob("#{MOUNTPOINT}/boot/vmlinuz-*")
+        raise "No kernel installed, compiling source fail..." if is_kernel == []
+      end
+
       def virtualbox_guest
-        exec("./kernel.sh -b -a virtualbox-guest -k #{@linux}") if ismatch?('vmwgfx')
-        Helpers::emerge("app-emulation/virtualbox-guest-additions", MOUNTPOINT)
+        return if ! ismatch?('vmwgfx')
+        garden("-a virtualbox-guest")
+        Getch::Emerge.new("app-emulation/virtualbox-guest-additions").pkg!
       end
 
       def qemu_guest
-        exec("./kernel.sh -a qemu-guest -k #{@linux}") if ismatch?('virtio')
-        exec("./kernel.sh -a kvm -k #{@linux}") if ismatch?('kvm')
+        garden("-a kvm-guest") if ismatch?('virtio')
+        garden("-a kvm") if ismatch?('kvm')
       end
 
       def ismatch?(arg)
         @lsmod.match?(/#{arg}/)
       end
 
-      def exec(cmd)
-        script = "chroot #{MOUNTPOINT} /bin/bash -c \"
-          source /etc/profile
-          cd /root/garden-master
-          #{cmd}
-        \""
-        Getch::Command.new(script).run!
+      def garden(cmd)
+        Getch::Garden.new(cmd).run!
       end
 
-      def exec_chroot(cmd)
-        script = "chroot #{MOUNTPOINT} /bin/bash -c \"
-          source /etc/profile
-          #{cmd}
-        \""
-        Getch::Command.new(script).run!
+      def install_wifi
+        return if ! ismatch?('cfg80211')
+        garden("-a wifi")
+        wifi_drivers
+        Getch::Emerge.new("net-wireless/iw wpa_supplicant net-wireless/iwd").pkg!
       end
 
-      def install_wifi
-        exec("./kernel.sh -b -a wifi -k #{@linux}")
-        Helpers::emerge("net-wireless/iw wpa_supplicant", MOUNTPOINT)
+      def install_audio
+        return if ! ismatch?('snd_pcm')
+        garden("-a sound")
       end
 
       def install_zfs
-        exec("./kernel.sh -b -a zfs -k #{@linux}")
+        garden("-a zfs")
         only_make # a first 'make' is necessary before emerge zfs
-        Helpers::emerge("zfs", MOUNTPOINT)
+        Getch::Emerge.new("sys-fs/zfs").pkg!
+      end
+
+      def wifi_drivers
+        garden("-a ath9k-driver") if ismatch?('ath9k')
       end
     end
   end

data/lib/getch/gentoo/stage.rb

@@ -60,7 +60,7 @@ module Getch
       # https://wiki.gentoo.org/wiki/Handbook:AMD64/Installation/Stage
       def decompress
         puts "Decompressing archive #{@stage_file}..."
-        cmd = "tar xpvf #{@stage_file} --xattrs-include='*.*' --numeric-owner"
+        cmd = "tar xpf #{@stage_file} --xattrs-include=\'*.*\' --numeric-owner"
         Getch::Command.new(cmd).run!
       end
 

data/lib/getch/log.rb

@@ -0,0 +1,54 @@
+require 'logger'
+
+module Getch
+  class Log
+    def initialize
+      @log_file = '/tmp/log_install.txt'
+      check_file
+      init_log
+      init_log_text
+    end
+
+    def info(msg)
+      @logger.info(msg)
+      @logger_text.info(msg)
+    end
+
+    def error(msg)
+      @logger.error(msg)
+      @logger_text.error(msg)
+    end
+
+    def debug(msg)
+      @logger.debug(msg)
+      @logger_text.debug(msg)
+    end
+
+    def fatal(msg)
+      @logger.fatal(msg)
+      @logger_text.fatal(msg)
+    end
+
+    private
+
+    def check_file
+      puts "Creating log at #{@log_file}" if ! File.exist? @log_file
+    end
+
+    def init_log
+      @logger = Logger.new(STDOUT)
+      @logger.level = DEFAULT_OPTIONS[:verbose] ? Logger::DEBUG : Logger::INFO
+      @logger.formatter = proc { |severity, datetime, progname, msg|
+        "#{severity}, #{msg}\n" 
+      }
+    end
+
+    def init_log_text
+      @logger_text = Logger.new(@log_file, 1)
+      @logger_text.level = Logger::DEBUG
+      @logger_text.formatter = proc { |severity, datetime, progname, msg|
+        "#{severity}, #{datetime}, #{msg}\n" 
+      }
+    end
+  end
+end

data/lib/getch/options.rb

@@ -32,8 +32,9 @@ module Getch
         opts.on("-d", "--disk DISK", "Disk where install Gentoo (sda,sdb)") do |disk|
           @disk = disk
         end
-        opts.on("-f", "--format FS", "Default use ext4") do |fs|
+        opts.on("-f", "--format FS", "Can be ext4, lvm. Default use ext4") do |fs|
           @fs = fs
+          DEFAULT_OPTIONS[:fs] = fs # dont known why, but it should be enforce
         end
         opts.on("-u", "--username USERNAME", "Initialize /home/username") do |user|
           @username = user

data/lib/getch/version.rb

@@ -1,3 +1,3 @@
 module Getch
-  VERSION = '0.0.7'.freeze
+  VERSION = '0.0.8'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: getch
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - szorfein
@@ -35,7 +35,7 @@ cert_chain:
   J/zT/q2Ac7BWpSLbv6p9lChBiEnD9j24x463LR5QQjDNS5SsjzRQfFuprsa9Nqf2
   Tw==
   -----END CERTIFICATE-----
-date: 2020-09-22 00:00:00.000000000 Z
+date: 2020-09-30 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -69,6 +69,13 @@ files:
 - lib/getch/filesystem/ext4/format.rb
 - lib/getch/filesystem/ext4/mount.rb
 - lib/getch/filesystem/ext4/partition.rb
+- lib/getch/filesystem/lvm.rb
+- lib/getch/filesystem/lvm/config.rb
+- lib/getch/filesystem/lvm/deps.rb
+- lib/getch/filesystem/lvm/device.rb
+- lib/getch/filesystem/lvm/format.rb
+- lib/getch/filesystem/lvm/mount.rb
+- lib/getch/filesystem/lvm/partition.rb
 - lib/getch/gentoo.rb
 - lib/getch/gentoo/boot.rb
 - lib/getch/gentoo/chroot.rb
@@ -76,6 +83,7 @@ files:
 - lib/getch/gentoo/sources.rb
 - lib/getch/gentoo/stage.rb
 - lib/getch/helpers.rb
+- lib/getch/log.rb
 - lib/getch/options.rb
 - lib/getch/states.rb
 - lib/getch/version.rb