getch 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87ae271211f6081929b72327651ff6e4f18adeca452cf10294d75a114f26db38
-  data.tar.gz: eb0ea1a935578351133e4c13dd0ee7e13d1696d6fbcc58bbd441e59d1cacf7de
+  metadata.gz: eb6075f7c63fb0a9b3d9cae63e24aae84cb3c90947985aa54ba48bc0dd284dcc
+  data.tar.gz: 26ad192fed5685f42e62d400706d6127c3d28a0fc5ce67296da6ef758955de25
 SHA512:
-  metadata.gz: b32454448824fef83fab42ac34534125b0dc6d0655235f271c97b644105dba75eebf0ca56b1c32e6a8cab019fa638d4e9fc44f20744cafd7ca584a94e05a0f4d
-  data.tar.gz: 809fc8dd380821f9bc479b4efee45f7f83cafc3a0a14a441881a3abd1daaeb0da84b20a2f2ff0af9bdee31cc1f247a21a873ef2729144ec2483aec8f165b6adf
+  metadata.gz: fe321ca0175f95f07c68026269830932609ba2fe5a1757efb7228bc26a069c4f5c322b21c534d05077c98a4dddfb0ed33bb2aa2fb30b1bc2df234e25b47acb56
+  data.tar.gz: 5b3540c9a1f07162bfbb3e4772f78c0b74b9525ec74fed7ce71c507da5f58befc85e6f8198abc595b49fa767abc77349f56b0ab9790d56730c45771365268fb0

data/CHANGELOG.md

@@ -1,8 +1,13 @@
+* 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
+
 ## 0.0.6, release 2020-09-19
-* Add support for QEMU guest #2
+* Add support for QEMU guest with KVM and Virtio driver
 * Kernel compilation, initialize a config file with `make localyesconfig`.
 * More modular codes to start with encryption and other filesystems.
-* Add the new option --verbose to display output of compilation, etc... #2
+* Add the new option --verbose to display output of compilation, etc...
 
 ## 0.0.5, release 2020-09-17
 * Generate a hostname

data/bin/setup.sh

@@ -37,19 +37,33 @@ search_ruby() {
   fi
 }
 
+install_with_gem() {
+  gem install getch
+  getch -h
+}
+
+dll_test_version() {
+  echo "Downloading the test version..."
+  cd /tmp
+  [ -f ./getch.tar.gz ] && rm ./getch.tar.gz
+  [ -d ./getch-master ] && rm -rf ./getch-master
+
+  curl -s -L -o getch.tar.gz https://github.com/szorfein/getch/archive/master.tar.gz
+  tar xzf getch.tar.gz \
+    && cd $DIR \
+    && ruby -I lib bin/getch -h
+}
+
 get_getch() {
   if hash gem 2>/dev/null ; then
-    gem install getch
-    getch -h
+    printf "Which version? [1] stable , [2] test (no recommended) " ; read -r
+    if echo "$REPLY" | grep -qP  "2" ; then
+      dll_test_version
+    else
+      install_with_gem
+    fi
   else
-    cd /tmp
-    [ -f ./getch.tar.gz ] && rm ./getch.tar.gz
-    [ -d ./getch-master ] && rm -rf ./getch-master
-
-    curl -s -L -o getch.tar.gz https://github.com/szorfein/getch/archive/master.tar.gz
-    tar xzf getch.tar.gz \
-      && cd $DIR \
-      && ruby -I lib bin/getch -h
+    dll_test_version
   fi
 }
 

data/lib/getch.rb

@@ -1,6 +1,5 @@
 require_relative 'getch/options'
 require_relative 'getch/states'
-require_relative 'getch/mount'
 require_relative 'getch/gentoo'
 require_relative 'getch/filesystem'
 require_relative 'getch/command'
@@ -15,6 +14,7 @@ module Getch
     disk: 'sda',
     fs: 'ext4',
     username: nil,
+    encrypt: false,
     verbose: false
   }
 
@@ -30,7 +30,7 @@ module Getch
 
   MOUNTPOINT = "/mnt/gentoo".freeze
   OPTIONS_FS = {
-    'ext4' => Getch::FileSystem::Ext4
+    'ext4' => DEFAULT_OPTIONS[:encrypt] ? Getch::FileSystem::Ext4::Encrypt : Getch::FileSystem::Ext4
   }.freeze
 
   def self.resume_options(opts)
@@ -41,6 +41,7 @@ module Getch
     puts "disk: #{DEFAULT_OPTIONS[:disk]}"
     puts "fs: #{DEFAULT_OPTIONS[:fs]}"
     puts "username: #{DEFAULT_OPTIONS[:username]}"
+    puts "encrypt: #{DEFAULT_OPTIONS[:encrypt]}"
     puts
     print "Continue? (n,y) "
     case gets.chomp
@@ -57,11 +58,8 @@ module Getch
     print "Partition and format disk #{disk}, this will erase all data, continue? (n,y) "
     case gets.chomp
     when /^y|^Y/
-      filesystem = OPTIONS_FS[fs].new(disk)
-      filesystem.cleaning
-      filesystem.partition
-      filesystem.format
-      OPTIONS_FS[fs]::Mount.new(disk, user).run
+      OPTIONS_FS[fs]::Partition.new
+      OPTIONS_FS[fs]::Format.new
     else
       exit 1
     end
@@ -80,8 +78,9 @@ module Getch
     options = Options.new(argv)
     DEFAULT_OPTIONS.freeze
     resume_options(options)
-    Getch::States.new() # Update States
+    Getch::States.new # Update States
     format(options.disk, options.fs, options.username)
+    OPTIONS_FS[DEFAULT_OPTIONS[:fs]]::Mount.new.run
     init_gentoo(options)
   end
 end

data/lib/getch/filesystem.rb

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

data/lib/getch/filesystem/ext4.rb

@@ -1,75 +1,13 @@
 module Getch
   module FileSystem
-    class Ext4 < Getch::FileSystem::Root
-      def initialize(disk)
-        @disk = disk
-        @fs = 'ext4'
-        super
-      end
-
-      class Mount < Getch::Mount
-        def initialize(disk, user)
-          @disk = disk
-          @user = user
-          super
-        end
-
-        private
-
-        def gen_vars
-          @dev_boot_efi = Helpers::efi? ? "/dev/#{@disk}1" : nil
-          @dev_swap = "/dev/#{@disk}2"
-          @dev_root = "/dev/#{@disk}3"
-          @dev_home = @user ? "/dev/#{@disk}4" : nil
-        end
-
-        def data_fstab
-          boot_efi = @dev_boot_efi ? "UUID=#{@uuid_boot_efi} /boot/efi vfat noauto,defaults  0 2" : ''
-          swap = @dev_swap ? "UUID=#{@uuid_swap} none swap discard 0 0" : ''
-          root = @dev_root ? "UUID=#{@uuid_root} / ext4 defaults 0 1" : ''
-          home = @dev_home ? "UUID=#{@uuid_home} /home/#{@user} ext4 defaults 0 2" : ''
-
-          return [ boot_efi, swap, root, home ]
-        end
-      end
-
-      private
-
-      # Follow https://wiki.archlinux.org/index.php/Partitioning
-      def partition_efi
-        # /boot/efi - EFI system partition - 260MB
-        # swap      - Linux Swap - size of the ram
-        # /         - Root
-        # /home     - Home
-        system("sgdisk -n1:1M:+260M -t1:EF00 /dev/#{@disk}") # boot EFI
-        system("sgdisk -n2:0:+2G -t2:8200 /dev/#{@disk}") # swap
-        system("sgdisk -n3:0:+15G -t3:8304 /dev/#{@disk}") # root
-        system("sgdisk -n4:0:0 -t3:8302 /dev/#{@disk}") # home
-      end
-
-      def format_efi
-        system("mkfs.fat -F32 /dev/#{@disk}1")
-        system("mkswap /dev/#{@disk}2")
-        system("mkfs.#{@fs} /dev/#{@disk}3")
-        system("mkfs.#{@fs} /dev/#{@disk}4")
-      end
-
-      def partition_bios
-        # None      - Bios Boot Partition - 1MiB
-        # swap      - Linux Swap - size of the ram
-        # /         - Root
-        # /home     - Home
-        system("sgdisk -n1:1MiB:+1MiB -t1:EF02 /dev/#{@disk}")
-        system("sgdisk -n2:0:+2G -t2:8200 /dev/#{@disk}")
-        system("sgdisk -n3:0:+15G -t3:8304 /dev/#{@disk}")
-        system("sgdisk -n4:0:0 -t3:8302 /dev/#{@disk}")
-      end
-
-      def format_bios
-        system("mkswap /dev/#{@disk}2")
-        system("mkfs.#{@fs} /dev/#{@disk}3")
-        system("mkfs.#{@fs} /dev/#{@disk}4")
-      end
+    module Ext4
     end
   end
 end
+
+require_relative 'ext4/device'
+require_relative 'ext4/partition'
+require_relative 'ext4/format'
+require_relative 'ext4/mount'
+require_relative 'ext4/config'
+require_relative 'ext4/deps'

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

@@ -0,0 +1,58 @@
+module Getch
+  module FileSystem
+    module Ext4
+      class Config < Getch::FileSystem::Ext4::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',
+            "options root=UUID=#{uuid_root} init=#{@init} 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=#{@dev_swap} init=#{@init} rw slub_debug=P page_poison=1 slab_nomerge pti=on vsyscall=none spectre_v2=on spec_store_bypass_disable=seccomp iommu=force\"\n"
+          File.write(file, cmdline, mode: 'a')
+        end
+
+        private
+
+        def gen_uuid
+          @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
+          @uuid_boot_efi = `lsblk -o "UUID" #{@dev_boot_efi} | tail -1`.chomp() if @dev_boot_efi
+          @uuid_home = `lsblk -o "UUID" #{@dev_home} | tail -1`.chomp() if @dev_home
+        end
+
+        def data_fstab
+          boot_efi = @dev_boot_efi ? "UUID=#{@uuid_boot_efi} /boot/efi vfat noauto,noatime 1 2" : ''
+          swap = @dev_swap ? "UUID=#{@uuid_swap} none swap discard 0 0" : ''
+          root = @dev_root ? "UUID=#{@uuid_root} / ext4 defaults 0 1" : ''
+          home = @dev_home ? "UUID=#{@uuid_home} /home/#{@user} ext4 defaults 0 2" : ''
+
+          [ boot_efi, swap, root, home ]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module Getch
+  module FileSystem
+    module Ext4
+      class Deps
+        def initialize
+          if Helpers::efi?
+            install_efi
+          else
+            install_bios
+          end
+        end
+
+        private
+        def install_efi
+        end
+
+        def install_bios
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Getch
+  module FileSystem
+    module Ext4
+      class Device
+        def initialize
+          @disk = DEFAULT_OPTIONS[:disk]
+          @user = DEFAULT_OPTIONS[:username]
+          @dev_boot_efi = Helpers::efi? ? "/dev/#{@disk}1" : nil
+          @dev_root = "/dev/#{@disk}2"
+          @dev_swap = "/dev/#{@disk}3"
+          @dev_home = @user ? "/dev/#{@disk}4" : nil
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module Getch
+  module FileSystem
+    module Ext4
+      module Encrypt
+      end
+    end
+  end
+end
+
+require_relative 'encrypt/device'
+require_relative 'encrypt/partition'
+require_relative 'encrypt/format'
+require_relative 'encrypt/mount'
+require_relative 'encrypt/config'
+require_relative 'encrypt/deps'

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

@@ -0,0 +1,62 @@
+module Getch
+  module FileSystem
+    module Ext4
+      class Config < Getch::FileSystem::Ext4::Encrypt::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',
+            "options crypt_root=UUID=#{uuid_dev_root} root=/dev/mapper/#{@vg}-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} crypt_root=UUID=#{@uuid_dev_root} root=/dev/mapper/#{@vg}-root init=#{@init} dolvm rw\"",
+            "GRUB_ENABLE_CRYPTODISK=y"
+          ]
+          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 = @lv_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/ext4/encrypt/deps.rb

@@ -0,0 +1,37 @@
+module Getch
+  module FileSystem
+    module Ext4
+      module Encrypt
+        class Deps
+          def initialize
+            if Helpers::efi?
+              install_efi
+            else
+              install_bios
+            end
+            install_deps
+          end
+
+          private
+          def install_efi
+          end
+
+          def install_bios
+            exec("euse -p sys-boot/grub -E device-mapper")
+          end
+
+          def install_deps
+            exec("euse -p sys-apps/systemd -E cryptsetup")
+            Helpers::emerge('genkernel cryptsetup lvm2')
+            exec("genkernel --install --luks --keymap #{DEFAULT_OPTIONS[:keyboard]} --lvm --kernel-config=/usr/src/linux/.config initramfs")
+            exec("systemctl enable lvm2-monitor")
+          end
+
+          def exec(cmd)
+            Helpers::run_chroot(cmd, MOUNTPOINT)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module Getch
+  module FileSystem
+    module Ext4
+      module Encrypt
+        class Device
+          def initialize
+            @disk = DEFAULT_OPTIONS[:disk]
+            @user = DEFAULT_OPTIONS[:username]
+            @dev_boot_efi = Helpers::efi? ? "/dev/#{@disk}1" : nil
+            @dev_root = "/dev/#{@disk}2"
+            @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
+end

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

@@ -0,0 +1,26 @@
+module Getch
+  module FileSystem
+    module Ext4
+      module Encrypt
+        class Format < Getch::FileSystem::Ext4::Encrypt::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 Helpers::efi?
+            system("mkswap #{@lv_swap}")
+            system("mkfs.#{@fs} #{@lv_root}")
+            system("mkfs.#{@fs} #{@lv_home}") if @lv_home
+            @state.format
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,64 @@
+require 'fileutils'
+
+module Getch
+  module FileSystem
+    module Ext4
+      module Encrypt
+        class Mount < Getch::FileSystem::Ext4::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()
+          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
+end

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

@@ -0,0 +1,95 @@
+module Getch
+  module FileSystem
+    module Ext4
+      module Encrypt
+        class Partition < Getch::FileSystem::Ext4::Encrypt::Device
+          def initialize
+            super
+            @state = Getch::States.new()
+            run_partition
+          end
+
+          def run_partition
+            return if STATES[:partition ]
+            clear_struct
+            cleaning
+            boot
+            others
+            luks
+            lvm
+            @state.partition
+          end
+
+          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
+
+          def boot
+            if Helpers::efi?
+              exec("sgdisk -n1:1M:+260M -t1:EF00 /dev/#{@disk}}")
+            else
+              exec("sgdisk -n1:1MiB:+1MiB -t1:EF02 /dev/#{@disk}")
+            end
+          end
+
+          def others
+            exec("sgdisk -n2:0:+0 -t2:8309 /dev/#{@disk}")
+          end
+
+          def luks
+            if Helpers::efi?
+              exec("cryptsetup --use-random luksFormat /dev/#{@disk}2")
+              exec("cryptsetup open --type luks /dev/#{@disk}2 crypt-lvm")
+            else
+              # GRUB do not support LUKS2
+              exec("cryptsetup --use-random luksFormat --type luks1 /dev/#{@disk}2")
+              exec("cryptsetup open --type luks1 /dev/#{@disk}2 crypt-lvm")
+            end
+          end
+
+          def lvm
+            mem=`awk '/MemTotal/ {print $2}' /proc/meminfo`.chomp + 'K'
+            exec("pvcreate /dev/mapper/crypt-lvm")
+            exec("vgcreate #{@vg} /dev/mapper/crypt-lvm")
+            exec("lvcreate -L 15G -n root #{@vg}")
+            exec("lvcreate -L #{mem} -n swap #{@vg}")
+            exec("lvcreate -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
+            # swap      - Linux Swap - size of the ram
+            # /home     - Home
+
+          # Partition_bios
+            # None      - Bios Boot Partition - 1MiB
+            # /         - Root
+            # swap      - Linux Swap - size of the ram
+            # /home     - Home
+
+          def exec(cmd)
+            Getch::Command.new(cmd).run!
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module Getch
+  module FileSystem
+    module Ext4
+      class Format < Getch::FileSystem::Ext4::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 Helpers::efi?
+          system("mkswap -f #{@dev_swap}")
+          system("mkfs.#{@fs} #{@dev_root}")
+          system("mkfs.#{@fs} #{@dev_home}") if @dev_home
+          @state.format
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,62 @@
+require 'fileutils'
+
+module Getch
+  module FileSystem
+    module Ext4
+      class Mount < Getch::FileSystem::Ext4::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 ! @dev_swap
+          system("swapon #{@dev_swap}")
+        end
+
+        def mount_root
+          return if ! @dev_root
+          Dir.mkdir(@root_dir, 0700) if ! Dir.exist?(@root_dir)
+          system("mount #{@dev_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 ! @dev_home
+          if @user != nil then
+            FileUtils.mkdir_p @home_dir, mode: 0700 if ! Dir.exist?(@home_dir)
+            system("mount #{@dev_home} #{@home_dir}")
+          end
+          @state.mount
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,75 @@
+module Getch
+  module FileSystem
+    module Ext4
+      class Partition < Getch::FileSystem::Ext4::Device
+        def initialize
+          super
+          @state = Getch::States.new()
+          run_partition
+        end
+
+        def run_partition
+          return if STATES[:partition ]
+          clear_struct
+          cleaning
+          if Helpers::efi?
+            partition_efi
+          else
+            partition_bios
+          end
+          @state.partition
+        end
+
+        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
+        end
+
+        def partition_bios
+          # None      - Bios Boot Partition - 1MiB
+          # /         - 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!
+        end
+      end
+    end
+  end
+end

data/lib/getch/gentoo.rb

@@ -44,7 +44,7 @@ module Getch
         return if STATES[:gentoo_kernel]
         chroot.kernel
         chroot.kernel_deps
-        chroot.install_tools
+        chroot.install_pkgs
       end
 
       def kernel

data/lib/getch/gentoo/boot.rb

@@ -6,10 +6,12 @@ module Getch
       def initialize(opts)
         @disk = opts.disk
         @user = opts.username
+        @config = OPTIONS_FS[DEFAULT_OPTIONS[:fs]]::Config.new()
       end
 
       def start
-        gen_fstab
+        @config.fstab
+        OPTIONS_FS[DEFAULT_OPTIONS[:fs]]::Deps.new()
         bootloader
         password
         umount
@@ -29,23 +31,13 @@ module Getch
         puts "Configuring systemd-boot."
         # ref: https://forums.gentoo.org/viewtopic-p-8118822.html
         esp = '/boot/efi'
-        #systemd = "#{MOUNTPOINT}/usr/lib/systemd"
-        #FileUtils.mkdir_p "#{systemd}#{esp}", mode: 0700 if ! Dir.exist?("#{systemd}#{esp}")
         exec_chroot("bootctl --path #{esp} install")
-
-        root = `lsblk -o "PARTUUID" /dev/#{@disk}3 | tail -1`.chomp()
-        init = '/usr/lib/systemd/systemd'
-        datas_gentoo = [
-          'title Gentoo Linux',
-          'linux /vmlinuz',
-          "options root=PARTUUID=#{root} init=#{init} rw"
-        ]
         datas_loader = [
           'default gentoo',
           'timeout 3',
           'editor 0'
         ]
-        File.write("#{MOUNTPOINT}/#{esp}/loader/entries/gentoo.conf", datas_gentoo.join("\n"))
+        @config.systemd_boot
         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)
@@ -61,6 +53,7 @@ module Getch
       def grub
         puts 'Installing GRUB...'
         Helpers::emerge("sys-boot/grub:2", MOUNTPOINT)
+        @config.grub
         exec_chroot("grub-install /dev/#{@disk}")
         exec_chroot('grub-mkconfig -o /boot/grub/grub.cfg')
       end
@@ -86,11 +79,6 @@ module Getch
 
       private
 
-      def gen_fstab
-        mount = Getch::Mount.new(@disk, @user)
-        mount.gen_fstab
-      end
-
       def exec_chroot(cmd)
         script = "chroot #{MOUNTPOINT} /bin/bash -c \"
           source /etc/profile

data/lib/getch/gentoo/chroot.rb

@@ -3,6 +3,7 @@ module Getch
     class Chroot
       def initialize
         @state = Getch::States.new()
+        @pkgs = []
         mount
       end
 
@@ -32,7 +33,8 @@ module Getch
         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")
-        Helpers::emerge("sys-kernel/gentoo-sources linux-firmware", MOUNTPOINT)
+        @pkgs << "sys-kernel/gentoo-sources"
+        @pkgs << "dev-util/dwarves"
       end
 
       def kernel_deps
@@ -41,8 +43,10 @@ module Getch
         garden_dep
       end
 
-      def install_tools
-        Helpers::emerge("dhcpcd", MOUNTPOINT)
+      def install_pkgs
+        @pkgs << "app-admin/sudo"
+        @pkgs << "app-editors/vim"
+        Helpers::emerge(@pkgs.join(" "), MOUNTPOINT)
       end
 
       private
@@ -59,9 +63,8 @@ module Getch
 
       def garden_dep
         Helpers::emerge("gentoolkit", MOUNTPOINT)
-        cmd = "euse -p sys-apps/kmod -E lzma"
-        Helpers::emerge("kmod", MOUNTPOINT)
-        exec_chroot(cmd)
+        exec_chroot("euse -p sys-apps/kmod -E lzma")
+        @pkgs << "sys-apps/kmod"
       end
 
       def mount

data/lib/getch/gentoo/config.rb

@@ -11,13 +11,13 @@ module Getch
 
       def portage
         nproc = `nproc`.chomp()
-        efi = Helpers::efi? ? 'GRUB_PLATFORMS="efi-64"' : ''
+        grub_pc = Helpers::efi? ? '' : 'GRUB_PLATFORMS="pc"'
         data = [
           '',
           'ACCEPT_KEYWORD="amd64 ~amd64"',
           "MAKEOPTS=\"-j#{nproc} -l#{nproc}\"",
           'INPUT_DEVICES="libinput"',
-          efi
+          grub_pc
         ]
         File.write(@make, data.join("\n"), mode: "a")
       end

data/lib/getch/gentoo/sources.rb

@@ -20,9 +20,10 @@ module Getch
 
       def make
         puts "Compiling kernel sources"
-        only_make
-        cmd = "cd #{@linux} && make modules_install && make install"
+        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
@@ -73,7 +74,7 @@ module Getch
 
       def install_zfs
         exec("./kernel.sh -b -a zfs -k #{@linux}")
-        only_make # a first make is necessary before emerge zfs
+        only_make # a first 'make' is necessary before emerge zfs
         Helpers::emerge("zfs", MOUNTPOINT)
       end
     end

data/lib/getch/helpers.rb

@@ -38,4 +38,12 @@ module Helpers
     \""
     Getch::Command.new(cmd).run!
   end
+
+  def self.run_chroot(cmd, path)
+    script = "chroot #{path} /bin/bash -c \"
+      source /etc/profile
+      #{cmd}
+    \""
+    Getch::Command.new(script).run!
+  end
 end

data/lib/getch/options.rb

@@ -2,7 +2,7 @@ require 'optparse'
 
 module Getch
   class Options
-    attr_reader :language, :zoneinfo, :keyboard, :disk, :fs, :username, :verbose
+    attr_reader :language, :zoneinfo, :keyboard, :disk, :fs, :username, :encrypt, :verbose
 
     def initialize(argv)
       @language = DEFAULT_OPTIONS[:language]
@@ -11,6 +11,7 @@ module Getch
       @disk = DEFAULT_OPTIONS[:disk]
       @fs = DEFAULT_OPTIONS[:fs]
       @username = DEFAULT_OPTIONS[:username]
+      @encrypt = DEFAULT_OPTIONS[:encrypt]
       @verbose = DEFAULT_OPTIONS[:verbose]
       parse(argv)
     end
@@ -37,7 +38,10 @@ module Getch
         opts.on("-u", "--username USERNAME", "Initialize /home/username") do |user|
           @username = user
         end
-        opts.on("-v", "--verbose", "Write more messages to the standard output.") do
+        opts.on("--encrypt", "Encrypt your filesystem.!! NOT YET READY !!") do
+          @encrypt = true
+        end
+        opts.on("--verbose", "Write more messages to the standard output.") do
           @verbose = true
         end
         opts.on("-h", "--help", "Display this") do

data/lib/getch/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: getch
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - szorfein
@@ -35,7 +35,7 @@ cert_chain:
   J/zT/q2Ac7BWpSLbv6p9lChBiEnD9j24x463LR5QQjDNS5SsjzRQfFuprsa9Nqf2
   Tw==
   -----END CERTIFICATE-----
-date: 2020-09-19 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -56,7 +56,19 @@ files:
 - lib/getch/command.rb
 - lib/getch/filesystem.rb
 - lib/getch/filesystem/ext4.rb
-- lib/getch/filesystem/root.rb
+- lib/getch/filesystem/ext4/config.rb
+- lib/getch/filesystem/ext4/deps.rb
+- lib/getch/filesystem/ext4/device.rb
+- lib/getch/filesystem/ext4/encrypt.rb
+- lib/getch/filesystem/ext4/encrypt/config.rb
+- lib/getch/filesystem/ext4/encrypt/deps.rb
+- lib/getch/filesystem/ext4/encrypt/device.rb
+- lib/getch/filesystem/ext4/encrypt/format.rb
+- lib/getch/filesystem/ext4/encrypt/mount.rb
+- lib/getch/filesystem/ext4/encrypt/partition.rb
+- lib/getch/filesystem/ext4/format.rb
+- lib/getch/filesystem/ext4/mount.rb
+- lib/getch/filesystem/ext4/partition.rb
 - lib/getch/gentoo.rb
 - lib/getch/gentoo/boot.rb
 - lib/getch/gentoo/chroot.rb
@@ -64,7 +76,6 @@ files:
 - lib/getch/gentoo/sources.rb
 - lib/getch/gentoo/stage.rb
 - lib/getch/helpers.rb
-- lib/getch/mount.rb
 - lib/getch/options.rb
 - lib/getch/states.rb
 - lib/getch/version.rb
@@ -90,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A CLI tool to install Gentoo

metadata.gz.sig

@@ -1,2 +1,2 @@
-dHJ�`�M�D�X�>�[�ehY�58���}2
-�h�	�H�l�d�_��Ì�4��NR7V�Z7	�$��ۖ��`ZϹP���r�
��J���*������r/�Jٟ�I-d!(�z:9�Yh��l���gqX��;��h �V�����
�I��YŅ=���>[�!�o@_T��Ao�Kq	F|�kϣe%\�)�B$<�|�-�0�r��T�@�<�ܚh� �gǙ/�l�%��(@���FE�D~�����}��j���$���D
+���L�7Zrz�{
+1���Q���bp
��(�)��m�')��p�6i�N�+�V${8d��

data/lib/getch/filesystem/root.rb

@@ -1,63 +0,0 @@
-module Getch
-  module FileSystem
-    class Root
-      def initialize(disk)
-        @disk = disk
-        @fs = nil
-        @state = Getch::States.new()
-      end
-
-      # https://wiki.archlinux.org/index.php/Securely_wipe_disk
-      def cleaning
-        return if STATES[:partition ]
-        puts
-        print "Cleaning data on #{@disk}, can be long, avoid this on Flash Memory (SSD,USB,...) ? (n,y) "
-        case gets.chomp
-        when /^y|^Y/
-          system("dd if=/dev/urandom of=/dev/#{@disk} bs=4M status=progress")
-        else
-          return
-        end
-      end
-
-      def partition
-        return if STATES[:partition]
-        Helpers::exec_or_die("sgdisk --zap-all /dev/#{@disk}")
-        Helpers::exec_or_die("wipefs -a /dev/#{@disk}")
-        if Helpers::efi? then
-          puts "Partition disk #{@disk} for an EFI system"
-          partition_efi
-        else
-          puts "Partition disk #{@disk} for a Bios system"
-          partition_bios
-        end
-        @state.partition
-      end
-
-      def format
-        return if STATES[:format]
-        puts "Format #{@disk} with #{@fs}"
-        if Helpers::efi? then
-          format_efi
-        else
-          format_bios
-        end
-        @state.format
-      end
-
-      private
-
-      def partition_efi
-      end
-
-      def partition_bios
-      end
-
-      def format_efi
-      end
-
-      def format_bios
-      end
-    end
-  end
-end

data/lib/getch/mount.rb

@@ -1,88 +0,0 @@
-require 'fileutils'
-
-module Getch
-  class Mount
-    def initialize(disk, user)
-      @disk = disk
-      @user = user
-      @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()
-      gen_vars
-    end
-
-    def run
-      return if STATES[:mount]
-      mount_swap
-      mount_root
-      mount_boot
-      mount_home
-      mount_boot_efi if Helpers::efi?
-      @state.mount
-    end
-
-    def gen_fstab
-      file = "#{@root_dir}/etc/fstab"
-      FileUtils.mkdir_p "#{@root_dir}/etc", mode: 0700 if ! Dir.exist?("#{@root_dir}/etc")
-      gen_uuid
-      datas = data_fstab
-      File.write(file, datas.join("\n"))
-    end
-
-    private
-
-    def gen_vars
-      @dev_boot_efi = nil
-      @dev_boot = nil
-      @dev_root = nil
-      @dev_swap = nil
-      @dev_home = nil
-    end
-
-    def mount_swap
-      return if ! @dev_swap
-      system("swapon #{@dev_swap}")
-    end
-
-    def mount_root
-      return if ! @dev_root
-      Dir.mkdir(@root_dir, 0700) if ! Dir.exist?(@root_dir)
-      system("mount #{@dev_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 ! @dev_home
-      if @user != nil then
-        FileUtils.mkdir_p @home_dir, mode: 0700 if ! Dir.exist?(@home_dir)
-        system("mount #{@dev_home} #{@home_dir}")
-      end
-      @state.mount
-    end
-
-    def gen_uuid
-      @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
-      @uuid_boot_efi = `lsblk -o "UUID" #{@dev_boot_efi} | tail -1`.chomp() if @dev_boot_efi
-      @uuid_home = `lsblk -o "UUID" #{@dev_home} | tail -1`.chomp() if @dev_home
-    end
-
-    def data_fstab
-      return []
-    end
-  end
-end