getch 0.1.0 → 0.1.1

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

@@ -7,54 +7,17 @@ module Getch
         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
+            @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 ! @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 #{@luks_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 #{@luks_home} #{@home_dir}")
-            end
+            @mount.swap(@dev_swap)
+            @mount.root(@luks_root)
+            @mount.boot(@dev_boot)
+            @mount.esp(@dev_esp)
+            @mount.home(@luks_home)
             @state.mount
           end
         end

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

@@ -5,15 +5,17 @@ module Getch
         class Partition < Getch::FileSystem::Ext4::Encrypt::Device
           def initialize
             super
-            @state = Getch::States.new()
+            @state = Getch::States.new
+            @partition = Getch::FileSystem::Partition.new
+            @clean = Getch::FileSystem::Clean
             @log = Log.new
             run_partition
           end
 
           def run_partition
             return if STATES[:partition ]
-            clear_struct
-            cleaning
+            @clean.struct(@disk, @cache_disk, @home_disk)
+            @clean.hdd(@disk, @cache_disk, @home_disk)
             if Helpers::efi?
               partition_efi
               encrypt_efi
@@ -26,35 +28,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:8309 /dev/#{@disk}")
-            exec("sgdisk -n3:0:+#{mem} -t3:8200 /dev/#{@disk}")
-            exec("sgdisk -n4:0:0 -t4:8309 /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, "8309")
+            @partition.home(@dev_home, "8309") if @dev_home
           end
 
           def encrypt_efi
@@ -90,20 +73,18 @@ module Getch
             key_name = "crypto_keyfile.bin"
             @key_path = "#{keys_dir}/#{key_name}"
             FileUtils.mkdir keys_dir, mode: 0700 if ! Dir.exist?(keys_dir)
-            Getch::Command.new("dd bs=512 count=4 if=/dev/urandom of=#{@key_path}").run!
+            exec("dd bs=512 count=4 if=/dev/urandom of=#{@key_path}")
           end
 
           def partition_bios
             # None      - Bios Boot Partition - 1MiB
-            # /         - Root
             # swap      - Linux Swap - size of the ram
+            # /         - Root
             # /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:8309 /dev/#{@disk}")
-            exec("sgdisk -n3:0:+#{mem} -t3:8200 /dev/#{@disk}")
-            exec("sgdisk -n4:0:0 -t4:8309 /dev/#{@disk}") if @dev_home
+            @partition.gpt(@dev_gpt)
+            @partition.swap(@dev_swap)
+            @partition.root(@dev_root, "8309")
+            @partition.home(@dev_home, "8309") if @dev_home
           end
 
           def exec(cmd)

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

@@ -4,18 +4,16 @@ module Getch
       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}"
-          exec("mkfs.fat -F32 #{@dev_boot_efi}") if Helpers::efi?
+          exec("mkfs.fat -F32 #{@dev_esp}") if @dev_esp
           exec("mkswap -f #{@dev_swap}")
-          exec("mkfs.#{@fs} -F #{@dev_root}")
-          exec("mkfs.#{@fs} -F #{@dev_home}") if @dev_home
+          exec("mkfs.ext4 -F #{@dev_root}")
+          exec("mkfs.ext4 -F #{@dev_home}") if @dev_home
           @state.format
         end
 

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

@@ -1,59 +1,20 @@
-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()
+          @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 ! @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
+          @mount.swap(@dev_swap)
+          @mount.root(@dev_root)
+          @mount.boot(@dev_boot)
+          @mount.esp(@dev_esp)
+          @mount.home(@dev_home)
           @state.mount
         end
       end

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.struct(@disk, @cache_disk, @home_disk)
+          @clean.hdd(@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,8 +16,8 @@ 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',
@@ -44,18 +44,18 @@ module Getch
           @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_esp = `lsblk -o "UUID" #{@dev_esp} | tail -1`.chomp() if @dev_esp
           @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" : ''
+          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" : ''
 
-          [ boot_efi, boot, swap, root, home ]
+          [ efi, boot, swap, root, home ]
         end
       end
     end

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

@@ -42,9 +42,10 @@ module Getch
         end
 
         def install_deps
-          exec("euse -E lvm")
+          make_conf = "#{MOUNTPOINT}/etc/portage/make.conf"
+          exec("euse -E lvm") if ! Helpers::grep?(make_conf, /lvm/)
           Getch::Emerge.new('genkernel lvm2').pkg!
-          Getch::Garden.new('-a lvm').run!
+          Getch::Bask.new('-a lvm').run!
           exec("systemctl enable lvm2-monitor")
         end
 

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

@@ -1,17 +1,33 @@
 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_home = @home_disk ? "/dev/mapper/#{@vg}-home" : nil
+        end
+
+        private
+
+        def search_boot
+          if @boot_disk
+            @dev_gpt = @efi ? nil : "/dev/#{@boot_disk}1"
+            @dev_boot = @efi ? nil : "/dev/#{@boot_disk}2"
+            @dev_esp = @efi ? "/dev/#{@boot_disk}1" : nil
+          else
+            @dev_gpt = @efi ? nil : "/dev/#{@disk}1"
+            @dev_boot = @efi ? nil : "/dev/#{@disk}2"
+            @dev_esp = @efi ? "/dev/#{@disk}1" : nil
+            @root_part += 1
+            @root_part += 1 if ! @efi
+          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,7 +19,7 @@ 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',
@@ -54,12 +54,12 @@ module Getch
             @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_esp = `lsblk -o "UUID" #{@dev_esp} | tail -1`.chomp() if @dev_esp
             @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" : ''
+            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" : ''

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

@@ -49,7 +49,7 @@ module Getch
             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!
+            Getch::Bask.new('-a lvm').run!
             exec("systemctl enable lvm2-monitor")
           end
 

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

@@ -2,18 +2,34 @@ 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_home = @home_disk ? "/dev/mapper/#{@vg}-home" : nil
             @luks_root = "/dev/mapper/cryptroot"
+            @luks_home = @home_disk ? "/dev/mapper/crypthome" : nil
+          end
+
+          private
+
+          def search_boot
+            if @boot_disk
+              @dev_gpt = @efi ? nil : "/dev/#{@boot_disk}1"
+              @dev_boot = @efi ? nil : "/dev/#{@boot_disk}2"
+              @dev_esp = @efi ? "/dev/#{@boot_disk}1" : nil
+            else
+              @dev_gpt = @efi ? nil : "/dev/#{@disk}1"
+              @dev_boot = @efi ? nil : "/dev/#{@disk}2"
+              @dev_esp = @efi ? "/dev/#{@disk}1" : nil
+              @root_part += 1
+              @root_part += 1 if ! @efi
+            end
+          end
+
+          def search_swap
           end
         end
       end